Merge branch 'Leenhaart/master'
Minor Railcraft saltpeter item fix.
Backported Biomes o Plenty update.