Merge pull request #1 from hef/feature/readme

Feature/readme
Merge remote-tracking branch 'origin/develop'
Merge branch 'develop'
made login screen more pretty
Merge remote-tracking branch 'origin/develop'
added some logging to zoho information pulls
added a zoho management command

use ./manage.py zoho to sync zoho records
making the zoho module not runnable
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/vagrant

Conflicts:
	.gitignore
cleaned up fabfile

decided to take the simpler approach
going in a different direciton, not using vagrant