Merge pull request #2 from matsen/master

tidyings
make test will error on wrong output
	new file:   wercker.yml