Build/doc fixes

Hi,

Here are a few changes I had to do to build the project on my box (Arch Linux, gcc 4.9).

Cheers!