Merge branch 'master', remote-tracking branch 'origin' into tighter-tab

.gitignore

@@ -3,6 +3,7 @@ doc/gh-pages
 doc/*.html
 pkg/
 extras/imported/**
-!extras/imported/*/.yas_setup.el
+!extras/imported/*/.yas-setup.el
+.yas-compiled-snippets.el
 *.elc
 

README.mdown

@@ -29,7 +29,7 @@ Add the following in your `.emacs` file:
 
     (add-to-list 'load-path
                   "~/.emacs.d/plugins/yasnippet")
-    (require 'yasnippet) ;; not yasnippet-bundle
+    (require 'yasnippet)
     (yas/global-mode 1)
 
 Add your own snippets to `~/.emacs.d/snippets` by placing files there or invoking `yas/new-snippet`.

yasnippet.el

@@ -1611,9 +1611,9 @@ TEMPLATES is a list of `yas/template'."
   (unless (file-exists-p (concat directory "/" ".yas-skip"))
     ;; Load .yas-setup.el files wherever we find them
     ;;
-    (load ".yas-setup" 'noerror)
+    (load (expand-file-name ".yas-setup" directory) 'noerror)
     (if (and (not no-compiled-snippets)
-             (load ".yas-compiled-snippets" 'noerror))
+             (load (expand-file-name ".yas-compiled-snippets" directory) 'noerror))
         (message "Loading much faster .yas-compiled-snippets from %s" directory)
       (let* ((major-mode-and-parents (if mode-sym
                                          (cons mode-sym parents)
@@ -2280,7 +2280,7 @@ where snippets of table might exist."
               ;; create the .yas-parents file here...
               candidate)))))
 
-(defun yas/new-snippet (&optional NO-TEMPLATE)
+(defun yas/new-snippet (&optional no-template)
   "Pops a new buffer for writing a snippet.
 
 Expands a snippet-writing snippet, unless the optional prefix arg