Integration of the previous 4 PR's

This is a combined patch that includes the previous pull requests. Thought it might be easier to deal with. 

includes:
garrettux/knife-vagrant#10
garrettux/knife-vagrant#9
garrettux/knife-vagrant#8
garrettux/knife-vagrant#7