Merge Staging with Master

deploy script bugfixes and improved output