Updated 2013-10-25
Merge branch 'master' of github.com:GoNZooo/emacs-conf

Conflicts:
	.emacs.el