Recompiled usermanual.
Merge pull request #129 from VanNostrand/doc

Recompiled usermanual.
Add OSX build flag to travis yml
Install dependencies for travis more generally
Merge remote-tracking branch 'upstream/master' into cmake_qt5
maybe fix travis build for ubuntu