Added database creation and teardown
Merge branch 'master' into testing

Conflicts:
	Gruntfile.js
Merge pull request #420 from opengovfoundation/testing

Added database creation and teardown