Merge branch 'master' of https://github.com/fromageball/whometaxi

trying to be able to push to github the commit.
Merge branch 'master' of https://github.com/fromageball/whometaxi
took database info out of settings.py
took out secret key
updated settings and css file for large layout
Merge branch 'settingschanges'
added template_dir to settings
add settings_secret.py to .gitignore