Included dotfiles, changed template override order
Added CLI template files