Merge pull request #23 from rhayes-cida/master

Clean-up: ordered queries, no logo on Windows, JS bugs
Merge remote-tracking branch 'upstream/master'