diff --git a/wagtail/project_template/.gitignore b/wagtail/project_template/.gitignore
index 1f499b52e..aed6a6daf 100644
--- a/wagtail/project_template/.gitignore
+++ b/wagtail/project_template/.gitignore
@@ -4,4 +4,6 @@
 /*/*/settings/local.py
 /static/
 /media/
+/.vagrant/
 Vagrantfile.local
+/docs/_build/
diff --git a/wagtail/project_template/project_name/core/templates/core/home_page.html b/wagtail/project_template/project_name/core/templates/core/home_page.html
index 97f716590..8fc0112bd 100644
--- a/wagtail/project_template/project_name/core/templates/core/home_page.html
+++ b/wagtail/project_template/project_name/core/templates/core/home_page.html
@@ -2,7 +2,7 @@
 
 {% templatetag openblock %} load static core_tags {% templatetag closeblock %}
 
-{% templatetag openblock %} block body_class {% templatetag closeblock %}template-{% templatetag openvariable %} self|content_type_slugified {% templatetag closevariable %}{% templatetag openblock %} endblock {% templatetag closeblock %}
+{% templatetag openblock %} block body_class {% templatetag closeblock %}template-{% templatetag openvariable %} self|content_type|slugify {% templatetag closevariable %}{% templatetag openblock %} endblock {% templatetag closeblock %}
 
 {% templatetag openblock %} block content {% templatetag closeblock %}
     <h1>Welcome to your new Wagtail site!</h1>
diff --git a/wagtail/project_template/project_name/core/templatetags/core_tags.py b/wagtail/project_template/project_name/core/templatetags/core_tags.py
index cf757e1a4..05ebe808d 100644
--- a/wagtail/project_template/project_name/core/templatetags/core_tags.py
+++ b/wagtail/project_template/project_name/core/templatetags/core_tags.py
@@ -1,13 +1,12 @@
 from django import template
 from django.conf import settings
-from django.template.defaultfilters import slugify
-
 
 register = template.Library()
 
 
-# Return the model name/"content type" as a css-friendly string e.g blog-page, news-listing-page
-# Usage: {% verbatim %}{{ self|content_type_slugified }}{% endverbatim %}
+# Return the model name/"content type" as a string e.g BlogPage, NewsListingPage.
+# Can be used with "slugify" to create CSS-friendly classnames
+# Usage: {% verbatim %}{{ self|content_type|slugify }}{% endverbatim %}
 @register.filter
-def content_type_slugified(model):
-    return slugify(model.__class__.__name__)
+def content_type(model):
+    return model.__class__.__name__
diff --git a/wagtail/project_template/project_name/manage.py b/wagtail/project_template/project_name/manage.py
old mode 100644
new mode 100755
diff --git a/wagtail/project_template/project_name/project_name/settings/base.py b/wagtail/project_template/project_name/project_name/settings/base.py
index bd0b8d5b5..7d3a3bc73 100644
--- a/wagtail/project_template/project_name/project_name/settings/base.py
+++ b/wagtail/project_template/project_name/project_name/settings/base.py
@@ -12,7 +12,7 @@ from os.path import abspath, basename, dirname, join, normpath
 from sys import path
 
 # Absolute filesystem path to the Django project directory:
-DJANGO_ROOT = dirname(dirname(abspath(__file__)))
+DJANGO_ROOT = dirname(dirname(dirname(abspath(__file__))))
 
 # Absolute filesystem path to the top-level project folder:
 PROJECT_ROOT = dirname(DJANGO_ROOT)
@@ -122,6 +122,10 @@ STATICFILES_FINDERS = (
     'compressor.finders.CompressorFinder',
 )
 
+STATICFILES_DIRS = (
+    join(DJANGO_ROOT, 'static'),
+)
+
 MEDIA_ROOT = join(PROJECT_ROOT, 'media')
 MEDIA_URL = '/media/'
 
@@ -151,7 +155,7 @@ TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
 )
 
 TEMPLATE_DIRS = (
-    normpath(join(PROJECT_ROOT, 'templates')),
+    normpath(join(DJANGO_ROOT, 'templates')),
 )
 
 
diff --git a/wagtail/project_template/requirements.txt b/wagtail/project_template/requirements.txt
index b0c35405c..c1eacf044 100644
--- a/wagtail/project_template/requirements.txt
+++ b/wagtail/project_template/requirements.txt
@@ -1 +1,11 @@
--r requirements/dev.txt
+Django==1.6.5
+South==0.8.4
+psycopg2==2.5.2
+elasticsearch==1.1.1
+django-redis-cache==0.13.0
+django-celery==3.1.10
+wagtail==0.4.1
+
+# Developer tools
+Fabric==1.9.0
+Sphinx==1.2.2
diff --git a/wagtail/project_template/requirements/base.txt b/wagtail/project_template/requirements/base.txt
deleted file mode 100644
index c4a30fe6c..000000000
--- a/wagtail/project_template/requirements/base.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Django==1.6.5
-South==0.8.4
-psycopg2==2.5.2
-elasticsearch==1.1.1
-django-redis-cache==0.13.0
-django-celery==3.1.10
-wagtail==0.4
diff --git a/wagtail/project_template/requirements/dev.txt b/wagtail/project_template/requirements/dev.txt
deleted file mode 100644
index d0ed29d34..000000000
--- a/wagtail/project_template/requirements/dev.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--r base.txt
-
-Fabric==1.9.0
-Sphinx==1.2.2
diff --git a/wagtail/project_template/requirements/production.txt b/wagtail/project_template/requirements/production.txt
deleted file mode 100644
index a3e81b8dc..000000000
--- a/wagtail/project_template/requirements/production.txt
+++ /dev/null
@@ -1 +0,0 @@
--r base.txt
diff --git a/wagtail/project_template/requirements/test.txt b/wagtail/project_template/requirements/test.txt
deleted file mode 100644
index a3e81b8dc..000000000
--- a/wagtail/project_template/requirements/test.txt
+++ /dev/null
@@ -1 +0,0 @@
--r base.txt
diff --git a/wagtail/project_template/vagrant/provision.sh b/wagtail/project_template/vagrant/provision.sh
index 509bcc9af..c10b64e90 100755
--- a/wagtail/project_template/vagrant/provision.sh
+++ b/wagtail/project_template/vagrant/provision.sh
@@ -17,7 +17,7 @@ createdb -Upostgres $PROJECT_NAME
 # Virtualenv setup for project
 su - vagrant -c "/usr/local/bin/virtualenv $VIRTUALENV_DIR && \
     echo $PROJECT_DIR > $VIRTUALENV_DIR/.project && \
-    PIP_DOWNLOAD_CACHE=/home/vagrant/.pip_download_cache $PIP install -r $PROJECT_DIR/requirements/dev.txt"
+    PIP_DOWNLOAD_CACHE=/home/vagrant/.pip_download_cache $PIP install -r $PROJECT_DIR/requirements.txt"
 
 echo "workon $PROJECT_NAME" >> /home/vagrant/.bashrc