Merge branch 'patch-2' of https://github.com/samuk/transitionnetwork.org-d6.profile into samuk-patch-2

Conflicts:
	transitionnetwork.org-d6.make
Merge branch 'samuk-patch-2'
Merge pull request #4 from paulbooker/master

 Location module patch