rename
smaller default font on linux
updates for newer versions of packages
don't use tabbar anymore
Merge branch 'master' of github.com:timfel/my_emacs_for_rails

Conflicts:
	init-el-get-packages.el