fix(router): update to confd 0.5.x branch to fix sort issue
fix(deisctl): fix global unit display
Merge pull request #2033 from gabrtv/fix-router-signals

fix(router): update to confd 0.5.x branch to fix sort issue
fix(router): Use official javascript content type

application/x-javascript is obsolete and shouldn't be used. http://stackoverflow.com/a/9664327
feat(router): Improved router defaults

Use recommended values from
https://github.com/h5bp/server-configs-nginx/blob/master/nginx.conf
fix(tests): Increased test timeout for smoke tests

For some heroku buildpacks the initial setup is really slow.
Merge pull request #2039 from gabrtv/fix-list-units

fix(deisctl): fix global unit display
Merge pull request #2043 from johanneswuerbach/patch-7

fix(tests): Increased test timeout for smoke tests
Merge pull request #2040 from johanneswuerbach/patch-6

fix(router): Use official javascript content type