Cakefile: add server:{start,watch} + tidy up