Plastic jug renamed to gallon jug, plastic moved to description.
Merge branch 'master' into plastic_jug_to_gallon_jug

Conflicts:
	itypedef.cpp
Merge pull request #229 from GlyphGryph/plastic_jug_to_gallon_jug

Plastic jug to gallon jug