Ubuntu 13.10 build fixes
Merge pull request #69 from Eyescale/master

Ubuntu 13.10 build fixes