Syncing a few changes, mostly about making Rakefiles use 2 space indent though