Cleaned up nbinput mac a bit
Hopfully console fixed for windows now.
Merge branch 'master' of ssh://github.com/olls/graphics