Merge pull request #58 from sircrimer/master

Update of Flaxbeards Steam Power and Botania
Merge remote-tracking branch 'upstream/master'
Merge pull request #59 from sircrimer/master

Update changlog file with versions allready in the repo.
Merge remote-tracking branch 'upstream/master'