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

* origin/master:
  Fixed dumb python-mode hijaking ruby thing.
  Removed yasnippet.