ENH: fixing up recording.py
Merge branch 'develop' into feature/electrode-config
Merge branch 'develop' into feature/electrode-config
recording updates
Merge branch 'quick-e' into feature/electrode-config
ENH: allow any punctuation to separate shanks
Merge branch 'develop' into feature/electrode-config
ENH: print out given "nshanks" when not correct
Merge branch 'develop' into feature/electrode-config
MERGE stash
TST: add testing
TST: remove print stmts
TST: test for None in recording.py
Merge branch 'develop' into feature/electrode-config
stuff
add 2.6 compat ordered dict
indentation
ag
should work now
cleanup