Adding Shipyard to Jenkins instance. Changing the Jenkins port to 80.
Merge remote-tracking branch 'origin/master'