diff --git a/{{cookiecutter.repo_name}}/.gitignore b/{{cookiecutter.repo_name}}/.gitignore
index 4b45be78b..50ef6fb8d 100644
--- a/{{cookiecutter.repo_name}}/.gitignore
+++ b/{{cookiecutter.repo_name}}/.gitignore
@@ -41,6 +41,8 @@ nosetests.xml
 # Pycharm
 .idea/*
 !.idea/{{cookiecutter.repo_name}}.iml
+!.idea/dataSources.xml
+!.idea/dataSources.local.xml
 !.idea/deployment.xml
 !.idea/modules.xml
 !.idea/webResources.xml
diff --git a/{{cookiecutter.repo_name}}/.idea/dataSources.local.xml b/{{cookiecutter.repo_name}}/.idea/dataSources.local.xml
new file mode 100644
index 000000000..66988a50e
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/dataSources.local.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="dataSourceStorageLocal">
+    <data-source name="PostgreSQL - postgres@localhost" uuid="4591ae40-df2d-47bb-b164-7130902f1eac">
+      <secret-storage>master_key</secret-storage>
+      <user-name>postgres</user-name>
+      <schema-pattern>postgres.pg_catalog postgres.public</schema-pattern>
+      <default-schemas>postgres.pg_catalog postgres.public</default-schemas>
+    </data-source>
+  </component>
+</project>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/dataSources.xml b/{{cookiecutter.repo_name}}/.idea/dataSources.xml
new file mode 100644
index 000000000..a66c9b38d
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/dataSources.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" hash="1472382126">
+    <data-source source="LOCAL" name="PostgreSQL - postgres@localhost" uuid="4591ae40-df2d-47bb-b164-7130902f1eac">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://localhost:25432/postgres</jdbc-url>
+      <libraries />
+    </data-source>
+  </component>
+</project>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/{{cookiecutter.repo_name}}.iml b/{{cookiecutter.repo_name}}/.idea/{{cookiecutter.repo_name}}.iml
index 803767dda..9842be015 100644
--- a/{{cookiecutter.repo_name}}/.idea/{{cookiecutter.repo_name}}.iml
+++ b/{{cookiecutter.repo_name}}/.idea/{{cookiecutter.repo_name}}.iml
@@ -11,7 +11,11 @@
     </facet>
   </component>
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
+      <excludeFolder url="file://$MODULE_DIR$/.sass-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/node_modules" />
+    </content>
     <orderEntry type="jdk" jdkName="Remote Python 2.7.9 (sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/{{cookiecutter.repo_name}}/debug.yml b/{{cookiecutter.repo_name}}/debug.yml
index 7809a5fbd..3f3122b0d 100644
--- a/{{cookiecutter.repo_name}}/debug.yml
+++ b/{{cookiecutter.repo_name}}/debug.yml
@@ -1,5 +1,7 @@
 postgres:
   image: postgres
+  ports:
+   - "25432:5432"
   volumes:
     # If you are using boot2docker, postgres data has to live in the VM for now until #581 is fixed
     # for more info see here: https://github.com/boot2docker/boot2docker/issues/581