remove theme dir
Merge changes to the git tree
Merge branch 'master' of git://github.com/LehmRob/dotfiles

Conflicts:
	.gitmodules
	emacs.d/theme