trackpad settings
mac stuff
Merge branch 'master' of http://github.com/sampowers/dotfiles
puppet stuff