Lokaltog/powerline — pull request #994 by ZyX-I (2014-08-16 10:47:53+00:00)
Title: Refactor watchers code

Merging this should ease up rebasing #906 until I figure out how to fix it.