Make compile for me! I'm on ubuntu 12.04 gcc4.7

Not sure why these errors weren't a problem for you
Merge pull request #1 from ostlerc/master

Make compile