Some zhiz
Merge pull request #1375 from ahomatthew/projects/jnap

Some zhiz
Stabliziation or router, query, and overall functionality
Merge branch 'projects/jnap' of github.com:sightmachine/SimpleSeer into projects/jnap