Brewfile: Install `p7zip` (i.e. `7z` etc.)
.osx: Kill `cfprefsd` after changing preferences

As of OS X 10.9 this is necessary to make sure the changes persist.

Closes #330.
Brewfile: Install ImageMagick with WebP support
.vimrc: Explicitly use the Molokai theme
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  .vimrc: Explicitly use the Molokai theme
  Brewfile: Install ImageMagick with WebP support
  .osx: Kill `cfprefsd` after changing preferences
  Brewfile: Install `p7zip` (i.e. `7z` etc.)

Conflicts:
	.vimrc