- moved VERSION to __version__
- cleanups
Merge remote-tracking branch 'origin/master'

Conflicts:
	custard/__init__.py
	custard/builder.py