Revert "Experiment to see if declaration order matters to puppet."

This reverts commit ae9367a1e1682331264f064532f2fa9c35a8d71e.
Move vim and macvim into personal manifest for now.

The vim package is broken because it relies to pip. Pip is broken on OSX
for some reason. To install vim via boxen currently requires two boxen
runs: one run to install python (via homebrew which installs pip) and a
second run to install vim.