Build for mac os without significant changes of master's code (insead of osx branch). A bit later I can provide signed binary build for osx.
Merge pull request #150 from ttohin/feature/osx-build

Fix osx build
Patch incorrect #elif directives to #else directives
Add --fullscreen command line parameter. Fix some mistakes in --help.
Merge pull request #152 from mikeu/master

Patch incorrect #elif directives to #else directives