Merge branch 'release/1.1' into develop
Shuffle tests around a bit
Change db user
Prep for release
Merge branch 'release/1.1.1'