clear warnings
Merge branch 'master' into upstream
Merge branch 'master' of git://github.com/Philonous/pontarius-xmpp
Change the license to the three-clause BSD license
Support for containers 0.4
Merge pull request #39 from snoyberg/master

Support for containers 0.4
Merge branch 'master' into upstream