fixed some includes and style.
Merge branch 'dev' of github.com:djrieger/mjplusplus into dev