Uncomment out 'broken' tests that now work thanks to #120
Merge pull request #121 from michaelgwelch/master

Uncomment out 'broken' tests that now work thanks to #120
Replace most Foundation imports with Darwin or nothing
Merge pull request #122 from sharplet/clean-imports

Replace most Foundation imports with Darwin or nothing
One last conflict