Merge branch 'master' of https://github.com/junekhan/pylab

Conflicts:
	autogenie/builder.ini