Merge branch 'syntastic' into wip