Merge branch 'master' of https://github.com/gareth-rees/minipy

(All my previous changes were merged/implemented at gareth-rees
repository, except the `preservetoplevel` thing which was
maintained here)

Conflicts:
	minipy.py