Cannot use upload from deploy

https://gist.github.com/mrchrisadams/3084229/#comment-575046
Merge branch 'dev'