Add some html indenting and reenable expensive ruby highlighting
remap capslock to control
re-enable some plugins
Adjusting font size for desktop and removing conky
Add extra CPU graphs for desktop
Update conky to point to this computer's wired interface
Add conky back to startup
Change solarized 'black' color to a white
Steal some fancy git stuff coutesty of grb
Merge branch 'desktop' of github.com:thomas-holmes/dotfiles into desktop