Fixed url name problems
Merge pull request #4 from BUILDS-/master

Merge pull request #29 from cwoodall/master
Merge pull request #31 from cwoodall/master

Fixing url problem where the site cannot be in a subdirectory
Merge pull request #32 from BUILDS-/master

Fixed url name problems