Merge from develop to master

This gets the latest FPM changes live until Jordan has a chance to look at https://github.com/jordansissel/fpm/pull/776.
@Tapjoy/opsautomation