Merge from develop to master

This is the repaired build of fpm 1.1.0 which fixes the empty directory issue. It has been tested on TIAB.
@Tapjoy/opsautomation