better gitgutter
Merge branch 'madness' into vagrant

* madness:
  better gitgutter
up
Merge branch 'madness' into vagrant

* madness:
  up