tweak gitignore
Merge branch 'master' of github.com:slinderman/nb_spiketrains
tweak so population.resample([]) doesnt iterate