Some tweaks, almost complete
Merge branch 'master' of https://github.com/Arttii/ipython_flatland