only run travis for master
doing it the mike-park way
Merge branch 'dev'
only override url if vhost file exists
adding some basic help, also as another example of using plugin hooks
websocket support in NGINX , see: #45
websocket test init
Merge pull request #59 from grigio/master

Websocket support in NGINX ( ex: #45 )
me in AUTHORS
Merge pull request #60 from grigio/master

+ AUTHORS
disabling websocket test since its currently broken
more specific line counts
Run apt-get update after adding ppa
Escape variable in nginx post-deploy script

`$http_upgrade` is supposed to be a variable set by nginx. It was now substituted by nothing.
Create separate copy target in Makefile
Add pre-deploy hook

Adds a pre-deploy hook passing the name of the app and the image. The
hook allows plugins to setup external resources (such as databases) and
modify the image (running pre-deployment script from the app) before the
application is deployed by dokku.
Merge pull request #67 from asm89/pre-deploy-hook

[WIP] Add pre-deploy hook
Merge pull request #64 from asm89/patch-2

Escape variable in nginx post-deploy script
Merge pull request #62 from asm89/patch-1

Run apt-get update after adding ppa
Merge pull request #65 from asm89/makefile

Create separate copy target in Makefile