Fix #18 - see https://github.com/dotcloud/hipache/commit/4e246b147ee1597c405c4e5d06efa24ffc499fd3#commitcomment-5760411 for context
Merge pull request #96 from dotcloud/bug-fixes

Fix #18