Changes to allow the application to run in a subdirectory.
Merge branch 'ted'