Merge pull request #1 from piperchester/master

Clean up, minor refactor, implement spacebar to cycle.
Merge remote-tracking branch 'upstream/master'