Merge pull request #86 from rackerjoe/master

lots of changes
removed an errant nova list statement