Getting everything up-to-date...

Committing so I can stop manually merging things. 
Added Cement (Bucket, Liquid, Blocks)
Made Flint&Steel durability double if using hardcore setting
Misc minor changes