Add in hacks for CommuniCon
Merge branch 'master' of github.com:hawkthorne/hawkthorne-journey