Building universal binaries
Fixed broken tests by forcing i386 when needed.
Merge pull request #211 from ryanrhee/universal

Building universal binaries.