Merge pull request #11 from skizzerz/master

Merged from Skizzerz
Fixed a severe error by me.
Merge branch 'winmaster'
Small bugfix to OSX CMake
Added factions and improved citizen descriptions
Split up defs.hpp
skills view WIP
Fixed warnings
Added skills screen
Added additional contexts (WIP)
Digging designations now produce jobs.
Moved around framerate definitions
Small CMake tweak
Updated help screen
fix windows build