Fix for GNU sed
Merge pull request #531 from stepanstipl/fix-gnu_sed

Fix to work with GNU sed

Conflicts:
	script/bootstrap
Additional modules in Puppetfile
starting people::hakamadare class
Captured a bunch of apps in personal config
Fixing iTerm2 deployment
Disabling LibreOffice and imagemagick
Disabling omnigraffle, hopefully fixing vim
Disabling utorrent
Try reenabling imagemagick

Also make macvim depend on vim
Disabling vim, sadface
Stop yelling about librarian checkouts