added waffle badge
fixed waffle.io badge
Install nginx in dockerfile, created nginx conf and section in supervisor
updated django to 1.5.5
Attach to our proxy websocket. Set actual host and path in redis
Updated term.js to latest version.
  Also rewrote the way its loaded to match the term.js example,
  replacing socket.io with websocket.
In our run.sh, rebase not merge the git pull to update local code.
  If there are local commits, or on a different branch than master
  this was causing the editor to popup with a merge commit message
  and was disrupting the run.sh script.
Merge pull request #85 from jeffbaier/master

Downgrade Node.js back to v8.26 for hipache websocket issue.
Merge pull request #86 from jeffbaier/nginx-proxy

Nginx Proxy attach requests
fixed deploy bug
fixed deprecated md5 import
added logging for shipyard ; added log volume
fixed another deploy bug
fixed merge conflict with Dockerfile
Merge branch 'nginx-proxy'
add ability to have hipache serve ssl
minor update to supervisor conf
remove nginx resolver (aws console bug)
#88: nginx resolver support
Merge branch 'gh-88-nginx-resolver-fix'