Use ruby-mode for Vagrantfile.

init.el

@@ -20,7 +20,14 @@
 (setq dotfiles-dir (file-name-directory
                     (or (buffer-file-name) load-file-name)))
 
+;; Load up ELPA, the package manager
+
 (add-to-list 'load-path dotfiles-dir)
+
+(require 'package)
+(package-initialize)
+(require 'starter-kit-elpa)
+
 (add-to-list 'load-path (concat dotfiles-dir "/elpa-to-submit"))
 
 (setq autoload-file (concat dotfiles-dir "loaddefs.el"))
@@ -40,12 +47,6 @@
 ;; backport some functionality to Emacs 22 if needed
 (require 'dominating-file)
 
-;; Load up ELPA, the package manager
-
-(require 'package)
-(package-initialize)
-(require 'starter-kit-elpa)
-
 ;; Load up starter kit customizations
 
 (require 'starter-kit-defuns)

starter-kit-elpa.el

@@ -2,6 +2,8 @@
 ;;
 ;; Part of the Emacs Starter Kit
 
+(require 'cl)
+
 (defvar starter-kit-packages (list 'idle-highlight
                                    'ruby-mode
                                    'inf-ruby

starter-kit-ruby.el

@@ -16,11 +16,12 @@
 
 ;; Rake files are ruby, too, as are gemspecs, rackup files, etc.
 (add-to-list 'auto-mode-alist '("\\.rake$" . ruby-mode))
-(add-to-list 'auto-mode-alist '("Rakefile$" . ruby-mode))
 (add-to-list 'auto-mode-alist '("\\.gemspec$" . ruby-mode))
 (add-to-list 'auto-mode-alist '("\\.ru$" . ruby-mode))
+(add-to-list 'auto-mode-alist '("Rakefile$" . ruby-mode))
 (add-to-list 'auto-mode-alist '("Gemfile$" . ruby-mode))
 (add-to-list 'auto-mode-alist '("Capfile$" . ruby-mode))
+(add-to-list 'auto-mode-alist '("Vagrantfile$" . ruby-mode))
 
 ;; We never want to edit Rubinius bytecode
 (add-to-list 'completion-ignored-extensions ".rbc")