ignore tmp/*
account for port mapping changes in docker 0.7
Merge branch 'master' of github.com:srid/discourse-docker

Conflicts:
	.gitignore
	bin/discourse-start
	bin/make-admin
	bin/nginx-info
	bin/postgresql-info
	bin/postgresql-start
	bin/redis-info
	etc/supervisord.conf