updated a lot of things
Merge branch 'master' of github.com:jweaver60/juicevault