Revert "remove git stuff from command line... it takes fucking forever"

This reverts commit b43a04f1e129287782a3c003734fd649fa941c17.
update prefs
add ruby 1.8.7 for testing puppet modules with cardboard
update iterm2 puppet module