Merge pull request #10 from NeuroML/development

Merging development into master for v2beta1 release
Merge remote-tracking branch 'origin/master' into development