update django to 1_7b1
add heroku readme stuff
Add environment configurable emails settings
Merge pull request #18 from Apogaea/piper/django_1_7b1

update django to 1_7b1
Merge pull request #20 from Apogaea/piper/update_readme

add heroku readme stuff
Merge pull request #21 from Apogaea/piper/environment_based_email_settings

Add environment configurable emails settings
fix pep8 errors
change .env_defaults secret key to a better value
Merge pull request #23 from Apogaea/piper/fix_tests

fix pep8 errors
Shifts that require a code to claim.
make codes work
switch all 3rd party js to use cdn urls
Merge pull request #17 from Apogaea/piper/shifts_that_require_codes

Shifts that require a code to claim.
Merge branch 'master' of github.com:Apogaea/voldb

Conflicts:
	volunteer/settings.py
Added stayles for popup modals... attempted to add more display data but broken
work on styles and layout