Improve in-line test.
Make logo optional, and turn it off on Windows.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dj_eden_app/views/data_views.py
Add an order clause to the base selects.
Fix some javascript bugs.
Clean-up.
Merge pull request #23 from rhayes-cida/master

Clean-up: ordered queries, no logo on Windows, JS bugs