Updating batt function for Maverick
tweaking color column
setting up supercite to do citations
display-battery-mode not working on Mavericks currently.
updating daily agenda view
setting fill-column to more sane 78
Merge branch 'master' of github.com:verdammelt/dotfiles

Conflicts:
	.emacs.d/init.el