Sync fork with trunk

Sync request for my fork with main Galacticraft repos. Between 2014-05-31 and 2014-06-15.