Merged latest development 2.2.0 release into trunk.

git-svn-id: https://plugins.svn.wordpress.org/better-file-editor/trunk@1000205 b8457f37-d9ea-0310-8a92-e5e31aec5664