bug fixes
Merge branch 'master' of https://github.com/sjess/st4rshell-and-vagrant