drush changes
Merge branch '7.x' of https://github.com/discoverygarden/manidora into 7.x
Cleanup files from tmp in derivative creation.
Merge branch '7.x' of github.com:jordandukart/manidora into 7.x