Initial commit
Merge branch 'master' of https://github.com/brobeson/Tools

Conflicts:
	README.md
Merge branch 'master' of https://github.com/brobeson/Tools
improve the vimTools import/export script

Issue #2
I made the vimTools.sh script use kdiff3 to merge, instead of just
copying. As of this commit, the script only works on Windows.