Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/jinfroster/pgadmin3
Merge branch 'master' of https://github.com/jinfroster/pgadmin3
Merge branch 'master' of https://github.com/jinfroster/pgadmin3
Merge branch 'master' of https://github.com/jinfroster/pgadmin3
Improve status bar in Edit Data window

Dave Page: I think adding a bright yellow warning exclamation would be a good idea too
fixed var names