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

Conflicts:
	minipy.py
Preserve class/object attrs when minifying modules
Merge branch 'preserve-top-level-functions-and-variables'

Conflicts:
	minipy.py