added autodetect for windows
Merge branch 'ide-1.5.x' of https://github.com/sngl/Arduino into ide-1.5.x