Committing some old changes that were on roach2; hopefully they're valid.
Merge branch 'roachmantis' of https://github.com/project8/mantis into roachmantis
Merge branch 'roachmantis' of https://github.com/project8/mantis into roachmantis

Conflicts:
	Server/mt_digitizer_roach.cc
Fixing copying of data for non-interleaved setup