Merge branch 'release/0.10.1'
Apply patch from UF's private repo upstream.
Apply patch from UF's private 0.11.1-hcv branch.
Merge remote-tracking branch 'taeber/master' into develop

Conflicts:
	bin/redi_lib.py (used HEAD)
	db/README.md (deleted as per HEAD)
	vagrant/Makefile (Used HEAD)
Update CHANGELOG and setup.py for release 0.11.0
Merge branch 'release/0.11.0' into develop
Merge pull request #30 from pbchase/develop

Remove demographic test data from vagrant folder and adjust Makefile targets to match