Updated sass-rails and compass-rails
Made version of sass explicit to resolve LoadError: cannot load such file -- sass/script/node
Added node modules to gitignore
Merged from master and resolved conflicts