Add puppet module
Fix gitconfig colors causing iTerm with solarized to show diffs incorrectly
Changed reference to prezto master