First pass at a real optimizer.
Merge branch 'master' of https://github.com/fitze/feliscatus