minor changes
change
fix
Merge branch 'master' of https://github.com/washingtonstateuniversity/WSUMAGE-vagrant

Conflicts:
	rake/installer.rb