Fixed stuff with Chrono Boost
Merge branch 'master' of https://github.com/wjmelements/buildcraft

Conflicts:
	buildcraft.py