changes needed for tests to pass
Merge remote-tracking branch 'teravest/populate_test_db' into bg-finish-integration

Note: I resolved the conflicts here and included the bcrypt-hashed version of
the password for test user 1111.

Pull request #341 is still open but since the conflicts are resolved here it is
probably prefereable to close it and merge this instead when it's ready.

Conflicts:
	amgut/db/populate_test.sql