Minor bug fixes and clarification on trial settings and with keyboard
Cleaned up code, removed unnecessary methods.
Merge branch 'master' of https://github.com/garrisoh/Simon-ConCATination