install travis cl and coveralls
Merge branch 'develop' into blog

Conflicts:
	Gemfile
	Gemfile.lock