Merge branch 'hotfix-0.2' into develop
Merge branch 'hotfix-0.3' into develop
Merge branch 'develop' of github.com:maxnorton/prelaunchr into develop
commit updated db files and gemfile from development

;
Merge branch 'release-0.4'
remove troublesome host request calls from users_controller.rb and user_mailer.rb
Merge branch 'release-0.4'
update Gemfile to declare ruby 2.0.0 and add rails_12factor earlier
Merge branch 'release-0.4'
change config/production.rb to serve static assets = true
Merge branch 'release-0.4'
Merge branch 'release-0.4' into develop
fix average referrals function
layout improvements: bob and tor photo, sticky footer
experiment with fixing heroku assets pipeline
Merge branch 'release-0.5'
round avg referrals to one decimal place
Merge branch 'release-0.5'
update welcome email sender name/address
Merge branch 'release-0.5'