Fixed interface to windows interface picker
Comment resolutiosn from peternewman
Merge branch 'master' into small_fixes
Fixed lint errors from the build
Merge pull request #329 from nightrune/small_fixes

Fixed interface to windows interface picker