Tapjoy/fpm — pull request #41 by gerbercj (2014-10-10 19:59:22+00:00)
Title: 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