Update to some templates

Added user creation and renamed some templates so macvim does proper
syntax highlighting.