Remove zencoding and autoclose, format some bashrc lines to be consistent, and add rope commands for Python
Resolve merge conflict