Start of adding non hydra controls
Revert "Start of adding non hydra controls"

This reverts commit ca32bdd8d6901b7d6041dec04ddbc3de720ff468.
trying to clean everything up
Merge branch 'master' of github.com:dustinyoste/Whispy