keep -r, but default true
Merge pull request #1832 from dotcloud/26-default_r_flag

Autorestart containers by default
Added Dockerfile.tmLanguage to contrib
Merge pull request #1876 from asbjornenge/master

Added Dockerfile.tmLanguage to contrib