added ruby and email modes, among other things
Merge branch 'master' of https://github.com/amaloz/emacs-config

Conflicts:
	init.el

fixed merge problem