Janitorial work
Merge branch 'exp' of github.com:nickelpro/spock into exp