Adding tmux and make.
Upgrading libnss-resolver to 0.2.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dockerfiles/fedora/Dockerfile
	Dockerfiles/ubuntu14/Dockerfile