Make inserts for postgres optional
Update version number
Merge branch 'master' into fusionbox