Revert "Fix error with Xcode 6 and 64-bit compilation"
Merge pull request #20 from cbess/revert-19-master

Revert "Fix error with Xcode 6 and 64-bit compilation"