scott edits
Merge branch 'master' of github.com:slinderman/nb_spiketrains
Final changes to nbglm abstract