Docker

Merged Sid Sijbrandij requested to merge docker into master

Please tweet it after deploying.