Various changes, especially Syntastic addition