Move revel sample file to terse, fix issues exposed by that