Vault support
Merge origin/master
1.4 update- don't you love Spigot?