merge
Merge branch 'master' of github.com:thinq4yourself/bearded-robot-proto
Merge branch 'master' of github.com:thinq4yourself/bearded-robot-proto
Merge branch 'master' of github.com:thinq4yourself/bearded-robot-proto
Merge branch 'master' of github.com:thinq4yourself/bearded-robot-proto
Merge branch 'master' of heroku.com:bearded-robot-proto
more procfile tweaks to get heroku deployed and running