Remove unused vars
Rearrange all the code to be more sanely laid out
Merge branch 'master' of github.com:zencephalon/tekstflyt