Modifying some template names
Merge branch 'master' of https://github.com/dustinconrad/exile

Conflicts:
	controller/gem_controller.go
New template naming scheme.