Added deployment related stuff
starting out, this is a PITA
made local settings work in onetrueway style
starting up staging config
Merge branch 'master' into develop

Conflicts:
	settings/base.py
standardizing paths
Added some of the style info for login page
adding staging locations for static and media files
Merge branch 'feature/onetrueway' into develop

Conflicts:
	ps1auth/templates/base.html
	settings/base.py
removing accidently commited merge files
Merge branch 'develop' into feature/deployment

Conflicts:
	README.md
	requirements/base.txt
removed gunciorn from global config
Merge branch 'develop' into feature/vagrant

Conflicts:
	.gitignore
cleaned up fabfile

decided to take the simpler approach
going in a different direciton, not using vagrant
Merge branch 'feature/vagrant' into develop
adding a robots.txt
allowing robots for now
Merge branch 'develop' into feature/deployment
Merge branch 'feature/deployment' into develop