Delete -std=c++0x.  (Really, test to see that I can't commit.)
Merge branch 'master' of https://github.com/Sixstring982/MFMv2
Merge branch 'master' of https://github.com/Sixstring982/MFMv2
Merge branch 'master' of https://github.com/Sixstring982/MFMv2
Resolve Makefile conflict
Merge branch 'master' of https://github.com/Sixstring982/MFMv2
Merge branch 'master' of https://github.com/Sixstring982/MFMv2
Merge branch 'master' of https://github.com/Sixstring982/MFMv2
Add Point copy ctor; add a ref in manhattandir