Merge branch 'modular' of https://github.com/apdavison/nineml into adding_initial_states
removed initial condition from state variable object
Merge branch 'adding_initial_states'