Changed z to x
Merge branch 'master' into custom
Merge branch 'master' into custom
Merge branch 'master' into custom

Conflicts:
	plugin/blackhole.vim
Merge branch 'master' into custom
Many changes / refactorings
More fixes in preparation for releasing 2.0
Tweaks
Tweak
Tweaks to readme
Merge pull request #14 from svermeulen/custom

Major refactor to everything. Moved most of the code to autoload files, bug fixes, post-paste swap, etc.