Cale/stabilize dev env

@cahrens @chrisndodge: This pulls together #171, #172, and #173, and should make the dev environment much more stable. Can you both test it with your desired workflows (without any crazy hacks) to verify that it fixes the problems that you were seeing.