Merge pull request #27 from stevemcquaid/sean

Updated mail settings
Fixed typo. Specify which branch to pull from for deploy