Cleaned up filtering of controls a bit.
Merge branch 'master' of https://github.com/stormboy/whims