Don't assume defaults
Always rebuild source path when requested
Merge pull request #15 from TomHAnderson/make-source-path-dynamic

Make source path dynamic
[#15] Minor fixes

- Needed to swap the lines creating the service name and the route name,
  to ensure we have a service name when we create the route
- tabularized the ternaries for readability
Merge branch 'hotfix/15'

Close #15