replaced checksyntax with syntastic, minor changes