Cleanup

Code style, database entries for removed postinstall action (TODO - Need to delete in 3.2.1.sql update files), unrevert some of the plugin changes to make for an easier diff