Postgresql user creation changes
Megam_riak change
Merge remote-tracking branch 'ta/master'