Re-added unit constants
Merge branch 'master' of https://github.com/wjmelements/buildcraft