in progress
Merge remote-tracking branch 'origin/master' into adding-custom-query-back-in
support for custom query is back and prettier than ever
shift-enter for newline
example uses quotes properly
Merge pull request #201 from gterrono/adding-custom-query-back-in

Support for Custom Mongo Query
Merge remote-tracking branch 'origin/master' into add-root-url-to-settings

Conflicts:
	client/router.coffee