Refactored how service templates are used.
Resolved conflict in Gemfile.lock