Updated requirements
Fixed Django version in readme
Update versions to Django 1.7, Ubuntu Trusty 14.04
Changes to settings to be more like Django 1.7 defaults than 1.5
Amend local settings location in .gitignore
...but don't go writing to .gitignore willy-nilly
reinstate settings.SITE_ID
Merge pull request #10 from nimasmi/v2.2_ubuntu14.04_django1.7.1

Version 2.2: Ubuntu 14.04, Django 1.7.1
Merge branch 'master' into torchbox

Conflicts:
	Vagrantfile