Use my new ac-inf-ruby package for auto-complete in inf-ruby
Don't show trailing whitespace in any special-mode
Enable highlight-symbol in prog-mode
Don't suppress ruby-use-smie in Emacs HEAD
Ignore .achievements
Merge branch 'master' into mine

Conflicts:
	.gitignore