Add brakeman to Gemfile and travis
Merge branch 'master' of https://github.com/amberbit/KarmaTracker

Conflicts:
	Gemfile.lock
Add elasticsearch configuration to travis