fix: adjust where logs are rotated

Squashed commit of the following:

commit 3f275fdd90d36b743f162a0583bfebf99ff348fe
Author: Rachel McCuistion <rachel@infochimps.com>
Date:   Tue Mar 25 15:23:04 2014 -0500

    adjusting where logs are rotated

    Change-Id: If6a44b9d2c1302d5f66f2eec2aa4f8b0fdaac570

Change-Id: Idd648de7a5e177c23bcc4b625601fb9ffc37c062
Merge "fix: adjust where logs are rotated" into rc