Whoops.
Merge branch 'dev' of https://github.com/dejay/outbreak into dev