Remove DroidSans and install Menlo
Use Menlo in terminal
New pallete style for Solarized
Merge branch 'master' of git://github.com/leafac/dotfiles

Conflicts:
	terminal/files/terminalrc
	terminal/manifests/init.pp