Liquibase changes

Fixed some of the issues that arose out of JR's conflicts (my fault) and hooked everything up