corrected environment handling for locating psqlrc file
Merge remote-tracking branch 'origin/master'