testing, issue #1948: Increase TestAttachDetach and TestRunDetach timeout
Added Dockerfile.tmLanguage to contrib
Merge pull request #1876 from asbjornenge/master

Added Dockerfile.tmLanguage to contrib
Fix help text for -v option
Merge pull request #2084 from makeusabrew/patch-1

Fix help text for -v option
Clean out a few outdated FIXME items
Merge pull request #2061 from dotcloud/1948-test-detach

testing, issue #1948: Increase TestRunDetach timeout
Cleanup whitespace in API 1.5 docs

remove whitespace on blank lines
[docs] use angle brackets in MAINTAINER example email
Merge pull request #2109 from shamrin/patch-4

[docs] use angle brackets in MAINTAINER example email
Merge pull request #2106 from mastahyeti/api_1.5_docs_whitespace

Cleanup whitespace in API 1.5 docs
Merge pull request #2103 from tianon/clean-out-fixme

Clean out a few outdated FIXME items
Merge branch 'master' into patch-1