Rearranged some config elements for smoother transition from zero to deployment. Added some passing screenshot model tests.
Resolved merge conflicts.