diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_build.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_build.xml
new file mode 100644
index 000000000..5aef1f6c4
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_build.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker: grunt build" type="PythonConfigurationType" factoryName="Python" singleton="true">
+    <option name="INTERPRETER_OPTIONS" value="-c &quot;import os;os.system('grunt build --verbose')&quot;" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <module name="{{ cookiecutter.repo_name }}" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="SCRIPT_NAME" value="dummy.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_compass.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_compass.xml
new file mode 100644
index 000000000..a00c9920b
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_compass.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker: grunt compass" type="PythonConfigurationType" factoryName="Python" singleton="true">
+    <option name="INTERPRETER_OPTIONS" value="-c &quot;import os;os.system('grunt compass --verbose')&quot;" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <module name="{{ cookiecutter.repo_name }}" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="SCRIPT_NAME" value="dummy.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_serve.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_serve.xml
new file mode 100644
index 000000000..0f1ef6da8
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_serve.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker: grunt serve" type="PythonConfigurationType" factoryName="Python" singleton="true">
+    <option name="INTERPRETER_OPTIONS" value="-c &quot;import os;os.system('grunt serve --verbose')&quot;" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <module name="{{ cookiecutter.repo_name }}" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="SCRIPT_NAME" value="dummy.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_start_email_server.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_start_email_server.xml
new file mode 100644
index 000000000..a42ee122b
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_start_email_server.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker: grunt start-email-server" type="PythonConfigurationType" factoryName="Python" singleton="true">
+    <option name="INTERPRETER_OPTIONS" value="-c &quot;import os;os.system('grunt start-email-server --verbose')&quot;" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <module name="{{ cookiecutter.repo_name }}" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="SCRIPT_NAME" value="dummy.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_stop_email_server.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_stop_email_server.xml
new file mode 100644
index 000000000..7b44b338b
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_stop_email_server.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker: grunt stop-email-server" type="PythonConfigurationType" factoryName="Python" singleton="true">
+    <option name="INTERPRETER_OPTIONS" value="-c &quot;import os;os.system('grunt stop-email-server --verbose')&quot;" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <module name="{{ cookiecutter.repo_name }}" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="SCRIPT_NAME" value="dummy.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_watch.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_watch.xml
new file mode 100644
index 000000000..d6cebf82b
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__grunt_watch.xml
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker: grunt watch" type="PythonConfigurationType" factoryName="Python" singleton="true">
+    <option name="INTERPRETER_OPTIONS" value="-c &quot;import os;os.system('grunt watch --verbose')&quot;" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <module name="{{ cookiecutter.repo_name }}" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="SCRIPT_NAME" value="dummy.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml
new file mode 100644
index 000000000..fc4d53ead
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml
@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker: tests - class: TestUser" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+    </envs>
+    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <module name="{{ cookiecutter.repo_name }}" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="TARGET" value="{{ cookiecutter.repo_name }}.users.tests.test_models.TestUser" />
+    <option name="SETTINGS_FILE" value="" />
+    <option name="CUSTOM_SETTINGS" value="false" />
+    <option name="USE_OPTIONS" value="false" />
+    <option name="OPTIONS" value="" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___file__test_models.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___file__test_models.xml
new file mode 100644
index 000000000..cbdf088d7
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___file__test_models.xml
@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker: tests - file: test_models" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+    </envs>
+    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <module name="{{ cookiecutter.repo_name }}" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="TARGET" value="{{ cookiecutter.repo_name }}.users.tests.test_models" />
+    <option name="SETTINGS_FILE" value="" />
+    <option name="CUSTOM_SETTINGS" value="false" />
+    <option name="USE_OPTIONS" value="false" />
+    <option name="OPTIONS" value="" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___module__users.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___module__users.xml
new file mode 100644
index 000000000..1a8c2b94a
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___module__users.xml
@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker: tests - module: users" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+    </envs>
+    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <module name="{{ cookiecutter.repo_name }}" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="TARGET" value="{{ cookiecutter.repo_name }}.users" />
+    <option name="SETTINGS_FILE" value="" />
+    <option name="CUSTOM_SETTINGS" value="false" />
+    <option name="USE_OPTIONS" value="false" />
+    <option name="OPTIONS" value="" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml
new file mode 100644
index 000000000..467aab0fb
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml
@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Docker: tests - specific: test_get_absolute_url" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+    </envs>
+    <option name="SDK_HOME" value="sftp://docker_{{ cookiecutter.repo_name }}@localhost:2222/usr/local/bin/python" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <module name="{{ cookiecutter.repo_name }}" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="TARGET" value="{{ cookiecutter.repo_name }}.users.tests.test_models.TestUser.test_get_absolute_url" />
+    <option name="SETTINGS_FILE" value="" />
+    <option name="CUSTOM_SETTINGS" value="false" />
+    <option name="USE_OPTIONS" value="false" />
+    <option name="OPTIONS" value="" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/build.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/build.xml
new file mode 100644
index 000000000..74e9fe2a0
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/build.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="build" type="js.build_tools.grunt" factoryName="Grunt.js" singleton="false">
+    <gruntfile value="$PROJECT_DIR$/Gruntfile.js" />
+    <tasks>
+      <task value="build" />
+    </tasks>
+    <pass-parent-env-vars value="true" />
+    <force value="false" />
+    <verbose value="true" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/compass.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/compass.xml
new file mode 100644
index 000000000..0ad62a93f
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/compass.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="compass" type="js.build_tools.grunt" factoryName="Grunt.js" singleton="false">
+    <gruntfile value="$PROJECT_DIR$/Gruntfile.js" />
+    <tasks>
+      <task value="compass" />
+    </tasks>
+    <pass-parent-env-vars value="true" />
+    <force value="false" />
+    <verbose value="true" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/serve.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/serve.xml
new file mode 100644
index 000000000..dd1904d94
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/serve.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="serve" type="js.build_tools.grunt" factoryName="Grunt.js" singleton="false">
+    <gruntfile value="$PROJECT_DIR$/Gruntfile.js" />
+    <tasks>
+      <task value="serve" />
+    </tasks>
+    <pass-parent-env-vars value="true" />
+    <force value="false" />
+    <verbose value="true" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/start_email_server.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/start_email_server.xml
new file mode 100644
index 000000000..52f271a3e
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/start_email_server.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="start-email-server" type="js.build_tools.grunt" factoryName="Grunt.js">
+    <gruntfile value="$PROJECT_DIR$/Gruntfile.js" />
+    <tasks>
+      <task value="start-email-server" />
+    </tasks>
+    <pass-parent-env-vars value="true" />
+    <force value="false" />
+    <verbose value="true" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/stop_email_server.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/stop_email_server.xml
new file mode 100644
index 000000000..a4faf046f
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/stop_email_server.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="stop-email-server" type="js.build_tools.grunt" factoryName="Grunt.js" singleton="false">
+    <gruntfile value="$PROJECT_DIR$/Gruntfile.js" />
+    <tasks>
+      <task value="stop-email-server" />
+    </tasks>
+    <pass-parent-env-vars value="true" />
+    <force value="false" />
+    <verbose value="true" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/.idea/runConfigurations/watch.xml b/{{cookiecutter.repo_name}}/.idea/runConfigurations/watch.xml
new file mode 100644
index 000000000..b674ad35c
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/.idea/runConfigurations/watch.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="watch" type="js.build_tools.grunt" factoryName="Grunt.js" singleton="false">
+    <gruntfile value="$PROJECT_DIR$/Gruntfile.js" />
+    <tasks>
+      <task value="watch" />
+    </tasks>
+    <pass-parent-env-vars value="true" />
+    <force value="false" />
+    <verbose value="true" />
+    <envs />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/README.rst b/{{cookiecutter.repo_name}}/README.rst
index 756b656d3..96a15b4f3 100644
--- a/{{cookiecutter.repo_name}}/README.rst
+++ b/{{cookiecutter.repo_name}}/README.rst
@@ -7,7 +7,7 @@
 LICENSE: BSD
 
 Settings
-------------
+--------
 
 {{cookiecutter.project_name}} relies extensively on environment settings which **will not work with Apache/mod_wsgi setups**. It has been deployed successfully with both Gunicorn/Nginx and even uWSGI/Nginx.
 
diff --git a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
index cc51a7b89..b746bc6a4 100755
--- a/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
+++ b/{{cookiecutter.repo_name}}/compose/pycharm/entrypoint
@@ -28,8 +28,8 @@ cat /ssh_id_rsa.pub > /home/$user/.ssh/authorized_keys
 chown $user:$user /home/$user
 chmod 755 /home/$user
 chmod 700 /home/$user/.ssh
-chmod 700 /home/docker/.ssh
-chmod 600 /home/docker/.ssh/authorized_keys
+chmod 700 /home/$user/.ssh
+chmod 600 /home/$user/.ssh/authorized_keys
 
 chown -R $user:$user /home/$user/
 
diff --git a/{{cookiecutter.repo_name}}/docker-compose.yml b/{{cookiecutter.repo_name}}/docker-compose.yml
index 01f5d68bc..99eaa9337 100644
--- a/{{cookiecutter.repo_name}}/docker-compose.yml
+++ b/{{cookiecutter.repo_name}}/docker-compose.yml
@@ -22,6 +22,7 @@ nginx:
 
 redis:
   image: redis:3.0
+
 {% if cookiecutter.use_celery == 'y' %}
 celeryworker:
   build: .
@@ -40,4 +41,5 @@ celerybeat:
     - postgres
     - redis
   command: celery -A {{cookiecutter.repo_name}}.taskapp beat -l INFO
-{% endif %}
\ No newline at end of file
+{% endif %}
+