Cleaned up tabs and removed ruby-debug
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock