update email creds
bump twitter
Merge branch 'master' of bitbucket.org:breid/btc
update btc promo material
old hash syntax
old hash syntax
Merge branch 'master' of bitbucket.org:breid/btc

Conflicts:
	Gemfile.lock
	log/development.log
	log/newrelic_agent.log