Ensuring master is on stable ppa for docker.
Again Dockefile on master branch should point to stable ppa.
Removing double entry in source list.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Docker/Dockerfile
Ensuring master point to stable ppa.
Merge pull request #7 from HurricaneHernandez/master

Hopefully this one merges.