Use correct syntax for comments in settings file
Clean URIs in DemoAdapter

Don't expose port number in uri if standard ports for HTTP and HTTPS are
used.
Copy URI logic from DemoAdapter to Service code
Fix DemoAdapter test after add of new content
Determine datatype in extractId function
Retrieve labels for service attributes via adapter
Merge pull request #5 from kolibre/cleanup-and-refactoring

Cleanup and refactoring