update Sun Sep 21 03:20:16 EDT 2014
Merge branch 'master' of github.com:johnwilliamblood/neuron