updates/consolidates migrations
merge master