Merge branch 'nbites'

Conflicts:
	src/man/memory/MVision.cpp
	src/man/memory/protos/Vision.proto
	src/qtool/viewer/VisionViewer.cpp
	src/qtool/viewer/VisionViewer.h
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'nbites'

Conflicts:
	src/qtool/viewer/VisionViewer.cpp
	src/qtool/viewer/VisionViewer.h
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'nbites'
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'master' of git://github.com/northern-bites/nbites into nbites
Merge branch 'nbites'
fixed some weird-ass merging that I did
having problems pushing, stackoverflow reccomended making a dummy commit
Merge branch 'fview_ballloc' of git://github.com/bjacobel/nbites
Non-stripy camera params for watson.
Changed MMKF to have 2 filters, choose between the two of them based on the velocity estimates
Makes logging images work reasonably.
Makes the tool fail slightly more gracefully if you don't have two image logs.
Cleaned up for pull request
Merge remote-tracking branch 'northern-bites/overhaul' into overhaul
Small sat fix for oversaturated ball.