merge lots of mike work on my master into chris2. Post Heroku
Merge branch 'master' into chris2
trying to make stripe heroku work with the KEYS
trying to make stripe heroku work with the KEYS again
changed stripe keys to config files as per zhao and out of bash profile
changed stripe keys to config files as per zhao and out of bash profile trying to get on heroku
Merge branch 'master' of github.com:rkuhel/lost_tribes3