Tapjoy/fpm — pull request #22 by gerbercj (2014-02-24 23:00:20+00:00)
Title: Feature/backmerge of sh

** DO NOT MERGE YET **

This PR will:
* Merge in all the changes to fpm between 0.4.43 and 1.0.2.
* Squash all the Tapjoy work
* Clean-up our work before we back merge

@Tapjoy/Ofanite