Merge in new development environment

Here is the new dev env!

Huzzah!

It doesn't need to take any merges upstream from master, just replace the head.