support eddie-vim and oh-my-zsh
Merge branch 'master' of https://github.com/dalang/razor-vagrant-demo

Conflicts:
	Rakefile
	manifests/default.pp
mv module tools to private
manage tools module in puppetfile