Dev

A collection of updates for you! I'm trying to figure out how to sync this with my 'master' branch, so you might get another request from that later...