Merge changes with master
Removed .env and duplicate secret_token.rb
Clean up controller methods into before filters
Clean up contact controller test
Refactor clontroller and feature test for contacts
Merge pull request #12 from sea-lions-2014/mh-address-book

Mh address book
Cleaned up a hige amount of CSS and JS, got rid of push state

Much refactor, such clean
Merge remote-tracking branch 'origin/master' into es-clean-up-js-css
Merge pull request #19 from sea-lions-2014/es-clean-up-js-css

Cleaned up a hige amount of CSS and JS, got rid of push state
fixed payment_controller
fixed merge conflicts