Small updates
Merge branch 'master' into updated-pgquiles
Properly install protobuf