ENH color for diff
do not test color diffs, temporarily...
fix paths in diff, thanks to @schodge
fix color wrong way around!
version bump
py34 support, of course
FIX windows diff message
fix
Merge remote-tracking branch 'upstream/master'