OS X cursor, fixes, prepare for new app
Merge branch 'master' into gh-pages