Debugged such that cli.py runs but fails to connect via softipbus
set cactus location to where most people keep it
Merge pull request #1 from nwoods/master

Nate's first bug fixes