Merge with devise branch

It seems like we can merge without too much trouble, I'm not quite sure what the smart way to do this is though.