* Initialize voltage in `fvm_cell::initialize` to `resting_potential_`.
* Remove errant end-of-line whitespace.
* Fix merge conflict (merged master).