Get Windows working
Merge branch 'unix'
Remove unnecessary gems
Merge branch 'master' into unix
Remove commented out gems