Merge pull request #8 from eucalyptus/master

Syncing up a bit of the changes.
Commit per a suggestion on ken to maintain the history.
Merge pull request #9 from risaacson/r2.2

Sync the update r2.2 over to the master.
Merge pull request #7 from risaacson/master

Sync risaacson to eucalyptus.