Marked Rakefile, Gemfile, config.ru for treating with ruby-mode
Merge branch 'master' of github.com:fester/emacs.d

Conflicts:
	init.el