added lots of things for chartbeat
Merge branch 'master' of github.com:dpeticol/.dotfiles

Conflicts:
	bashrc