Devel into master

Master isn't really being used right now, and devel is quite stable.