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
Merge branch 'master' of https://github.com/toddrjen/python-neo