FILTERZZ!
fixes
Merge pull request #1300 from Tendrid/projects/jnap

fixes
Merge pull request #1299 from ahomatthew/projects/jnap

FILTERZZ!
Whitespace
Merge branch 'projects/jnap' of github.com:sightmachine/SimpleSeer into projects/jnap