Merge pull request #28 from bphinz/buildfixes

Removed patch that was merged into trunk in 6bc1de83a7