local changes
Merge branch 'master' of github.com:hanbf/bfnix-scripts

Conflicts:
	sublime2/Packages/0_package_control_loader/dependency-metadata.json
	sublime2/Packages/Package Control/package_control/downloaders/urllib_downloader.pyc
	sublime2/Packages/Package Control/package_control/http/__init__.pyc
	sublime2/Packages/Package Control/package_control/http/debuggable_http_connection.pyc
	sublime2/Packages/Package Control/package_control/http/debuggable_http_handler.pyc
	sublime2/Packages/Package Control/package_control/http/debuggable_http_response.pyc
	sublime2/Packages/Package Control/package_control/http/debuggable_https_response.pyc
	sublime2/Packages/Package Control/package_control/http/invalid_certificate_exception.pyc
	sublime2/Packages/Package Control/package_control/http/persistent_handler.pyc
	sublime2/Packages/Package Control/package_control/http/validating_https_connection.pyc
	sublime2/Packages/Package Control/package_control/http/validating_https_handler.pyc
	sublime2/Packages/User/Package Control.sublime-settings