Trying to push to heroku
trying to deploy to heroku still
Changed database.yml file for heroku deployment
database.yml file still not working for heroku
Heroku stuff
finally getting heroku working
Email working again
Adjusted to push to heroku
Added email configuration for to production file
deleted freakin database.yml file AGAIN so Travis won't die
Adding database.yml
added travis file
fixing merge conflicts
Merge pull request #49 from red-admirals-2014/display_map_cards

Merged changes, branch ready.
Merge branch 'master' into updates
Making sure my branch is up-to-date with origin master.
added correct zoom and centering to map
Merge pull request #50 from red-admirals-2014/small_map_update

Small map update- centered map now.
Map ajax call done
Recovered linked_in work from stash
merge conflicts solved