Merge branch 'master' into yelp

* master:
  Removed yasnippet.
Added emacs starter kit.
Got rid of buggy starter-kit lisp mode.
Merge remote-tracking branch 'origin/yelp' into yelp

* origin/yelp:
  Fixed dumb python-mode hijaking ruby thing.
Merge remote-tracking branch 'origin/master' into yelp

* origin/master:
  Got rid of buggy starter-kit lisp mode.
  Added emacs starter kit.