Adding changes from Inigral branch
Merge branch 'osx_cole_inigral'
Adding changes from Inigral branch
Merge branch 'osx_detune' of github.com:coledot/dotfiles into osx_detune

Conflicts:
	.bashrc
Add dawkins and tame screen's memory usage
Add vim syntax file for puppet
Shuffling git aliases
Merge branch 'master' of github.com:coledot/dotfiles
normalizing bundles (again)