fixed dependancy conditionals, fixed depricated expressions
Merge branch 'master' of github.com:TheJumpCloud/VagrantPuppet