Document vagrant and travis ci in readme
Fix .travis.yml link in readme
Merge branch 'master' into projecttemplate-helpers-ideas

Conflicts:
	README.md