before merge
MINIMALLY PARSE PXYABW
Merge branch 'master' of http://github.com/ImAlsoGreg/haskell-tetrode-ephys

Conflicts:
	tetrode-ephys.cabal