Import source code
Merge branch 'master' of heroku.com:aqueous-scrubland-9766

Conflicts:
	app.json
use dev version of opbeat client
use opbeat 1.3.2 from github