* rebase master to selkies base, pending readme changes * fix testing * update readme for selkies * bad template vars in block