Nicer theme and fonts
Merge branch 'master' of https://github.com/rkd91/dotfiles

Conflicts:
	.emacs.el