Code cleanup! Added Vault class and added commands.
Merge remote-tracking branch 'origin/master'