Merge pull request #2 from NeuroML/development

Merging development into master for v2beta1 release
Initial version travis file
test commit
Better order in travis file
More on travis
Merge branch 'master' into development