Fixed nbinput (hopefully), needs testing on win/mac
Merge branch 'master' of ssh://github.com/olls/graphics