master
feature/persistent_data_with_knife_integration
feature/vagrant-1.5-compat
issue/10
tduffield-issue14