Add dawkins and tame screen's memory usage
Add vim syntax file for puppet
Shuffling git aliases
normalizing bundles
normalizing bundles (again)
Merge remote-tracking branch 'origin/osx_detune'

Conflicts:
	.gitconfig
	.inigral_ssh_aliases
	.screenrc
	.vim/bundle/.bundle_repos
Merge remote-tracking branch 'origin/osx_cole_inigral'
Merge remote-tracking branch 'origin/osx_cole_inigral'
add ssh agent
Merge branch 'osx_cole_inigral' of github.com:coledot/dotfiles into osx_cole_inigral