Updated to use a "version 2" of the template to allow transitions to be easier.
Also updated the core bash scripts to switch to the directory of the script.  This makes testing on a system that has the scripts easier without impacting the scripts