diff --git a/autoload/rails.vim b/autoload/rails.vim
index ca360759..51a2bc21 100644
--- a/autoload/rails.vim
+++ b/autoload/rails.vim
@@ -676,7 +676,7 @@ function! s:readable_calculate_file_type() dict abort
     let r = "metal"
   elseif f =~ '\<app/mailers/.*\.rb'
     let r = "mailer"
-  elseif f =~ '\<app/models/'
+  elseif f =~ '\<app/models/*rb'
     let top = join(s:readfile(full_path,50),"\n")
     let class = matchstr(top,'\<Acti\w\w\u\w\+\%(::\h\w*\)\+\>')
     if class == "ActiveResource::Base"
@@ -694,12 +694,14 @@ function! s:readable_calculate_file_type() dict abort
     else
       let r = "model"
     endif
-  elseif f =~ '\<app/views/layouts\>.*\.'
-    let r = "view-layout-" . e
-  elseif f =~ '\<\%(app/views\|components\)/.*/_\k\+\.\k\+\%(\.\k\+\)\=$'
-    let r = "view-partial-" . e
-  elseif f =~ '\<app/views\>.*\.' || f =~ '\<components/.*/.*\.'.s:viewspattern().'$'
-    let r = "view-" . e
+  elseif !(f =~ 'javascripts')
+    if f =~ '\<app/views/layouts\>.*\.'
+      let r = "view-layout-" . e
+    elseif f =~ '\<\%(app/views\|components\)/.*/_\k\+\.\k\+\%(\.\k\+\)\=$'
+      let r = "view-partial-" . e
+    elseif f =~ '\<app/views\>.*\.' || f =~ '\<components/.*/.*\.'.s:viewspattern().'$'
+      let r = "view-" . e
+    endif
   elseif f =~ '\<test/unit/.*_test\.rb$'
     let r = "test-unit"
   elseif f =~ '\<test/functional/.*_test\.rb$'
@@ -740,6 +742,10 @@ function! s:readable_calculate_file_type() dict abort
     let r = "log"
   elseif e == "css" || e =~ "s[ac]ss" || e == "less"
     let r = "stylesheet-".e
+  elseif e == "js" && !(f =~ 'spec')
+    let r = "javascript"
+  elseif e == "js" && f =~ 'spec'
+    let r = "javascript_spec"
   elseif e == "js"
     let r = "javascript"
   elseif e == "coffee"
@@ -1030,6 +1036,8 @@ function! s:app_tags_command() dict
     let cmd = "exuberant-ctags"
   elseif executable("ctags-exuberant")
     let cmd = "ctags-exuberant"
+  elseif executable("exctags")
+    let cmd = "exctags"
   elseif executable("ctags")
     let cmd = "ctags"
   elseif executable("ctags.exe")
@@ -2132,6 +2140,7 @@ function! s:BufFinderCommands()
   call s:addfilecmds("controller")
   call s:addfilecmds("mailer")
   call s:addfilecmds("migration")
+  call s:addfilecmds("schema")
   call s:addfilecmds("observer")
   call s:addfilecmds("helper")
   call s:addfilecmds("layout")
@@ -2287,6 +2296,14 @@ function! s:migrationList(A,L,P)
   endif
 endfunction
 
+function! s:schemaList(A,L,P)
+  let tables = s:readfile(rails#app().path('db/schema.rb'))
+  let table_re = '^\s\+create_table\s["'':]\zs[^"'',]*\ze'
+  call map(tables,'matchstr(v:val, table_re)')
+  call filter(tables,'strlen(v:val)')
+  return s:autocamelize(tables, a:A)
+endfunction
+
 function! s:unittestList(A,L,P)
   let found = []
   if rails#app().has('test')
@@ -2516,6 +2533,15 @@ function! s:migrationEdit(cmd,...)
   endif
 endfunction
 
+function! s:schemaEdit(cmd,...)
+  let cmd = s:findcmdfor(a:cmd)
+  let schema = 'db/'.s:environment().'_structure.sql'
+  if rails#app().has_file('db/schema.rb') || !rails#app().has_file(schema)
+    let schema = 'db/schema.rb'
+  endif
+  call s:findedit(cmd,schema.(a:0 ? '#'.a:1 : ''))
+endfunction
+
 function! s:fixturesEdit(cmd,...)
   if a:0
     let c = rails#underscore(a:1)
@@ -3073,10 +3099,23 @@ function! s:readable_related(...) dict abort
       let migration = "db/migrate/".get(candidates,0,migrations[0]).".rb"
     endif
     return migration . (exists('l:lastmethod') && lastmethod != '' ? '#'.lastmethod : '')
-  elseif f =~ '\<application\.js$'
-    return "app/helpers/application_helper.rb"
+  elseif self.type_name('javascript_spec')
+    return s:sub(s:sub(f, 'spec/javascripts', 'app/assets/javascripts'), '_spec.js', '.js')."\n"
   elseif self.type_name('javascript')
-    return "public/javascripts/application.js"
+    if f =~ 'public/javascripts'
+      let to_replace = 'public/javascripts'
+    else
+      let to_replace = 'app/assets/javascripts'
+    endif
+    let replace_with = 'spec/javascripts'
+    return s:sub(s:sub(f, to_replace, replace_with), '.js', '_spec.js')."\n"
+
+  " Adds support for cucumber alternate files
+  elseif self.type_name('cucumber-feature')
+    return s:sub(s:sub(f, 'features', 'features/step_definitions'), '.feature', '_steps.rb')."\n"
+  elseif self.type_name('cucumber-steps')
+    return s:sub(s:sub(f, 'features/step_definitions', 'features'), '_steps.rb', '.feature')."\n"
+
   elseif self.type_name('db/schema')
     return self.app().migration('')
   elseif self.type_name('view')
@@ -3600,7 +3639,7 @@ function! s:BufSyntax()
         syn match rubyRailsTestMethod '\.\@<!\<stub\>!\@!'
         if !buffer.type_name('spec-model')
           syn match   rubyRailsTestControllerMethod  '\.\@<!\<\%(get\|post\|put\|delete\|head\|process\|assigns\)\>'
-          syn keyword rubyRailsTestControllerMethod  integrate_views
+          syn keyword rubyRailsTestControllerMethod  integrate_views render_views
           syn keyword rubyRailsMethod params request response session flash
           syn keyword rubyRailsMethod polymorphic_path polymorphic_url
         endif
@@ -3699,6 +3738,9 @@ function! s:BufSyntax()
       set isk+=$
       exe "syn keyword javascriptRailsFunction ".s:javascript_functions
 
+    elseif &syntax == "scss" || &syntax == "sass"
+      syn match sassFunction "\<\%(\%(asset\|image\|font\|video\|audio\|javascript\|stylesheet\)-\%(url\|path\)\)\>(\@=" contained
+      syn match sassFunction "\<\asset-data-url\>(\@=" contained
     endif
   endif
   call s:HiDefaults()
@@ -4536,9 +4578,7 @@ augroup railsPluginAuto
   autocmd BufWritePost */tasks/**.rake            call rails#cache_clear("rake_tasks")
   autocmd BufWritePost */generators/**            call rails#cache_clear("generators")
   autocmd FileType * if exists("b:rails_root") | call s:BufSettings() | endif
-  autocmd Syntax ruby,eruby,yaml,haml,javascript,coffee,railslog if exists("b:rails_root") | call s:BufSyntax() | endif
-  autocmd QuickFixCmdPre  *make* call s:push_chdir()
-  autocmd QuickFixCmdPost *make* call s:pop_command()
+  autocmd Syntax ruby,eruby,yaml,haml,javascript,coffee,railslog,sass,scss if exists("b:rails_root") | call s:BufSyntax() | endif
 augroup END
 
 " }}}1
diff --git a/doc/rails.txt b/doc/rails.txt
index 6dbbb1e2..57013161 100644
--- a/doc/rails.txt
+++ b/doc/rails.txt
@@ -271,6 +271,7 @@ itself!).
 :Rmodel						|rails-:Rmodel|
 :Robserver					|rails-:Robserver|
 :Rplugin					|rails-:Rplugin|
+:Rschema					|rails-:Rschema|
 :Rspec						|rails-:Rspec|
 :Rstylesheet					|rails-:Rstylesheet|
 :Rtask						|rails-:Rtask|
@@ -378,6 +379,10 @@ itself!).
 			command is only defined if there is a spec folder in
 			the root of the application.
 
+						*rails-:Rschema*
+:Rschema [{table}]	Edit the schema and optionally jump to the specified
+			table.
+
 						*rails-:Rstylesheet*
 :Rstylesheet [{name}]	Edit the stylesheet for the specified name or current
 			controller.  Also supports Sass and SCSS.
diff --git a/plugin/rails.vim b/plugin/rails.vim
index 2dd17f76..15e183ab 100644
--- a/plugin/rails.vim
+++ b/plugin/rails.vim
@@ -79,6 +79,9 @@ function! s:escvar(r)
 endfunction
 
 function! s:Detect(filename)
+  if exists('b:rails_root')
+    return s:BufInit(b:rails_root)
+  endif
   let fn = substitute(fnamemodify(a:filename,":p"),'\c^file://','','')
   let sep = matchstr(fn,'^[^\\/]\{3,\}\zs[\\/]')
   if sep != ""
@@ -107,7 +110,7 @@ function! s:Detect(filename)
       return s:BufInit(fn)
     endif
     let ofn = fn
-    let fn = fnamemodify(ofn,':s?\(.*\)[\/]\(app\|config\|db\|doc\|features\|lib\|log\|public\|script\|spec\|stories\|test\|tmp\|vendor\)\($\|[\/].*$\)?\1?')
+    let fn = fnamemodify(ofn,':s?\(.*\)[\/]\(app\|config\|db\|doc\|extras\|features\|lib\|log\|public\|script\|spec\|stories\|test\|tmp\|vendor\)\($\|[\/].*$\)?\1?')
   endwhile
   return 0
 endfunction