Fix whitespace
Use nested dicts for ultra-fast generation :)
Merge pull request #3 from horazont/master

Whitespace and speed fixes. Thanks Jonas.