Added warpgate cooldowns to time_taken
Merge branch 'master' of https://github.com/wjmelements/buildcraft

Conflicts:
	bcorder.py
Merge branch 'master' of https://github.com/wjmelements/buildcraft
Fixed warp cooldown, make time_taken things dictionaries