Merge pull request #135 from cloudedge/master

BDD test progress
Merge pull request #137 from cloudedge/dbbase

With Anvil release, converge all migrations into a single file