Fixed problem with losing AnalogSignalArray.channel_indexes on  pickle/unpickle
Added the ability to merge annotations when merging analogsignalarrays
Oups
neto to elphy write (to be debugged)
Complete flow neo->elphy elphy->neo
Bug repported by thomas akam
Writing to and reading from elphy test file: spiketrains and analogsignals
Bug from sergej.hartfil@gmail.com
Merge branch 'master' of github.com:NeuralEnsemble/python-neo

q# especially if it merges an updated upstream into a topic branch.
Checked analogsignals reading(neo)->writing(elphy)->reading(elphy-to-neo)
added neo annotations as elphy dbrecord
cleared annotations treatment
Merge pull request #16 from rproepp/master

SpikeTrain.time_slice()
Merge pull request #17 from apdavison/master

Fixed problem with losing AnalogSignalArray.channel_indexes on  pickle/unpickle
PexonIO immprovement for thomas.akam@gmail.com
Assorted small fixes, mostly to ensure Python 2.6 and Python 3.2 compatibility
Update doc/source/developers_guide.rst

svn to git
Now allowing array-of-strings as annotation
Merge branch 'master' of github.com:NeuralEnsemble/python-neo
Adding configuration file for Travis CI