Working around the removal of _force_unicode in nose 1.3
bumped version number and removed custom_force_unicode function
removed a few more  redundant lines from the patch
Make git ignore vim swapfiles
Merge remote-tracking branch 'blrm/master'

Conflicts:
	nose_xunitmp.py
	setup.py

Greatly simplify the code used for writing out errors. Bump version.