Merged with my version of the code

Removed redundancies in the code; some relics and most of all SD card
functionality.  Enabled mixing in the collection routine again simply
because pinching the air supply for so long was unwise.