Kitchen sink revised.
Merge branch 'master' of https://github.com/plnice/ngcontrols