WIP commit. Need to merge up to current state.

Signed-off-by: Keri Clowes <kerilyn.clowes@gmail.com>
Merge branch 'WIP'
Commiting migrations for team.

Signed-off-by: Keri Clowes <kerilyn.clowes@gmail.com>
Merge branch 'master' of github.com:gSchool/g2-dashboard