updated teacup to pre-0.4.2
cleanup templates, start using camelCase with teacup