Shotgun and Spec running together
Merge branch 'cleanup'