Switch deploy branch back to master
Updated deploy script to support different branches
Merge branch 'master' into ember_conversion