adding modules
adding packages
adding packages
fixing iterm
macvim broken
old fitbit
modified site.pp
merged upstream
update
merging