Re-deactivated Kilim. Gave up on it.
Merge branch 'master' of github.com:skunkiferous/PingPong
Minor changes to be more user friednly