Merge pull request #22 from NeuroML/development

Merging development into master for v2beta1 release
Merge pull request #23 from NeuroML/development

Merging development into master for v2beta1 release
Merge branch 'development'

* development: (41 commits)
  Changed to master
  Adding desc at start of file
  Minor changes to comptype defs; using DerivedParameter in place of DerivedVariable in distal/proximal
  Update HISTORY.md
  More updates to history
  Update HISTORY.md
  Some updates to history file
  Allowing a colon in neuroLexId, e.g. neuroLexId="GO:0043025"
  Supporting ionChannelHH in main schema & updated examples
  Using <ionChannelHH...> in preference to <ionChannel type="ionChannelHH"..>
  Improved handling of onevents etc
  More pythonic naming
  Improved handling of dimensions/units
  Initial version working with pylems
  Initial version of web page generator for nml2 comp type defs using old Python API
  New comptype baseSpikingCell, which is what baseCellMembPot & baseCellMembPotDL extend
  Renaming Children element in spikeArray to not confuse PyLEMS
  Changing ln to log to use Java/Python perferred method name. Ok @robertcannon?
  Minor change to network spec
  More consistent use of complexType names, e.g iafTauCell -> IafTauCell, not IaFTauCell
  ...
Updating docs
Update HISTORY.md
Merge branch 'master' into development

* master:
  Update HISTORY.md
  Updating docs