Add and reorder plugins
Merge branch 'master' of github:daneah/dotfiles