Merge branch 'add-syntastic' into experimental