Big ol hunk of unfinished commit
Merge branch 'master' of github.com:nickelpro/spock