Add dawkins and tame screen's memory usage
Add vim syntax file for puppet
Shuffling git aliases
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
Merge branch 'master' of github.com:coledot/dotfiles
normalizing bundles (again)
normalizing bundles (yet again)
meh
vim bundle stuff
more shit
add ack.vim bundle"
add ack cmd
various tweaks/fixes
oops
more updates are more betterer
Merge remote-tracking branch 'origin/osx_detune'

Conflicts:
	.gitconfig
	.inigral_ssh_aliases
	.screenrc
	.vim/bundle/.bundle_repos