Way too much.
Merge pull request #22 from autokey/daren-too-much

fixes #3, #18
implements #5, #10, #12, #13 
partially implements #4