Merge pull request #20 from nmassey/new-skin

design refresh of "neo_phoenix" - initial phase
fixing
emergency
fix
fix
(CSS) fix assets so that they'll precompile cleanly

- fixes 2 typos
- add workaround for CSS files in subdirectories: move the require
  lines to toplevel (application.css) instead of via the @import
  directive in CSS file in the subdirectory.
  (There's a bug in Sass so that @import statements in subdirectories
  don't work properly.  Hopefully that will be fixed in future versions
  of Sass.)