remove coffee-mode
added coffee-mode
removed haml-mode
added haml-mode
Merge branch 'master' into datacare

* master:
  added haml-mode
  removed haml-mode
  added coffee-mode
  remove coffee-mode