Switch back to supertab
Merge branch 'master' into macosx