Merge branch 'master', remote-tracking branch 'nas/master'
Added vim pyte
Makefile update
Merge branch 'master', remote-tracking branch 'github/master'
Netbook merge