Fixing issues with build
Merge branch 'master' of github-sfdc:metadaddy-sfdc/Forcecraft