Merge pull request #1 from ilendl2/master

typos fixed and requirements fixed
Continued to add requirements and base settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	requirements/_base.txt
Changed the site_base.html
Merge branch 'master' of https://github.com/ilendl2/chrisdevsite-template

Conflicts:
	project_name/settings/base.py
	project_name/static/css/menu.css
	project_name/templates/flatpages/default.html
	project_name/templates/site_base.html
	requirements/_base.txt
Allow for devserver media serving under Django <= 1.4
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project_name/urls.py