Package cleanup
Merge branch 'master' of neufasel:configs/vim