jordansissel merged 3 commits into loggly:master from tabletcorry:master Aug 26, 2011