Syncing up small edits.
Merge branch 'master' of github.com:davmillar/DavesMapper
Merge branch 'master' of github.com:davmillar/DavesMapper
Merge branch 'master' of github.com:davmillar/DavesMapper
Merge branch 'master' of github.com:davmillar/DavesMapper
Merge branch 'master' of github.com:davmillar/DavesMapper
Merge branch 'master' of github.com:davmillar/DavesMapper
Emergency performance enhancements merging down into repo.
Conclude conflicted merge.