Remove SnipMate bundle and replace with UltiSnips
Add Command-T Vim plugin
Delete PeepOpen