Reducing layers in the dockerfile
Commiting changes from many days ago.