major update
Merge branch 'master' of ssh.github.com:rjbalest/neo