starting out, this is a PITA
Merge branch 'develop' into feature/vagrant

Conflicts:
	.gitignore
cleaned up fabfile

decided to take the simpler approach
going in a different direciton, not using vagrant
Merge branch 'feature/vagrant' into develop