Make sure we generate the current month as well as the older month

Change-Id: I7697d87d5f1c9a3006e2f24edf4f60287dbe9251
Don't say generating graph twice when generating full graphs

Change-Id: I3a98208dfcf9c63f565462d5dd1d1d8f3c4133f0