Use Bundler
Add travis CI
Add travis image
Merge remote-tracking branch 'tapa/master'

Conflicts:
	Rakefile