Trying to merge this in, but this line gives me an error.

```
ERROR: test_neurons_to_node (__main__.TestConnection)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "D:\Documents\nengogit\nengo\nengo\tests\test_connection.py", line 129, in test_neurons_to_node
    rasterplot(t, sim.data(a_spikes), ax=ax)
  File "D:\Documents\nengogit\nengo\nengo\matplotlib.py", line 35, in rasterplot
    color_cycle = ax._get_lines.color_cycle
AttributeError: type object '_get_lines' has no attribute 'color_cycle'
```


I'm using matplotlib 1.3.1, perhaps this has been changed recently?  I have been looking around trying to find a fix, but nothing obvious is coming up.