Merge pull request #4 from HurricaneHernandez/master

Fixed docker files to be stable rather than daily.
Enabling dev for docker.
Merge pull request #5 from HurricaneHernandez/dev

Enabling dev for docker. Please merge into a new branch. Named dev.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Docker/Dockerfile