Fixed MANIFEST.in so that docs and examples get included in the package
Merge branch 'master' of github.com:NeuralEnsemble/python-neo
Merge pull request #19 from dguarino/master

NEO to Elphy write
add neo.__version__ to avoid from neo.version import version
bug from cause by µ replace by u for quantities
Bug discovered by Fabienne Lienard
Merge branch 'master' of github.com:NeuralEnsemble/python-neo
Minor change to merging of annotations
Merge branch 'master' of github.com:apdavison/python-neo
Merge branch 'master' of https://github.com/dguarino/python-neo into dguarino-master
small bug fix
Merge pull request #20 from dguarino/master

 changed pynnio uS from 1e-9*S to 1e-6*S
Tags (=manual events) in ABF is somethings  that should be attached
 to Block but imcompatible with neo (because attached to segment).
This is now attached to the first Segment of the Block.
use modified matplotlib .gitignore for more reliably ignoring of files
Merge pull request #21 from toddrjen/gitignore

Update gitignore based on matplotlib one
make the sampling_period property settable in spiketrain
add sampling_period property to spike object for consistenct with spike_train
use decorators for sampling_period property in analogsignal
add spike_duration property to spiketrain.  This information is available from spike objects but not spiketrain objects
finer-grained handling of corner cases, particular None values, in properties of analogsignal, spike, and spiketrain