Merge pull request #149 from jrconlin/master

Fix timer metrics, cmd args, and new fonts
Merge pull request #154 from jrconlin/master

db create cleanup
Add version from file "GITREF".

When deploying, we will not be shipping the .git directory. This enables
OPs to write a "GITREF" file instead.
Merge branch 'master' into dev
Merge pull request #159 from jrconlin/master

Collapse Commands, Fix re-registration bug
Hack to fix old, invalid hawk sigs

* iff the db has a blank secret, allow the device to continue
Merge pull request #160 from jrconlin/master

Hack to fix old, invalid hawk sigs
Turn off auto no track

* Move no hawk to more debug friendly location
Merge pull request #161 from jrconlin/master

Turn off auto no track
Merge pull request #157 from oremj/get-version-from-file-or-git

Add version from file "GITREF".
heka: implement stdout sender

Fixes #162
Merge pull request #163 from oremj/162-heka-stdout-sender

heka: implement stdout sender
Merge pull request #164 from mozilla-services/dev

Dev
Merge pull request #165 from mozilla-services/master

sync to master