Updates for 2.0
Merge pull request #37 from RedRoserade/master

Updates for Forestry 2.0