Metrics in Admin

Squashed commit of the following:

commit 51b7e78bc256d96a67698d5ab7034448cb82e848
Author: Ian Shafer <ian@yabbly.com>
Date:   Tue Jul 15 13:07:20 2014 -0700

    wip

commit e11a04e4d2a6a24195d77290d93b4031b17241c6
Author: Ian Shafer <ian@yabbly.com>
Date:   Tue Jul 15 09:56:29 2014 -0700

    wip

commit 539a8439b1bb6d52d5c4a034c7474c37aea7d8a8
Author: Ian Shafer <ian@yabbly.com>
Date:   Tue Jul 15 09:14:58 2014 -0700

    Version update on release

commit 25d64f3afd2f408b21186b7782cb39e3ab088200
Author: Ian Shafer <ian@yabbly.com>
Date:   Tue Jul 15 09:14:54 2014 -0700

    Uber and Id updates

commit 2b3684832862675fedf5a53f96a7ed67c93b895f
Merge: ba00cbd 7cb323b
Author: Sam Skjonsberg <skoneberg@gmail.com>
Date:   Mon Jul 14 16:26:38 2014 -0700

    Merge remote-tracking branch 'upstream/master'

commit ba00cbd82ccaf4211677153578361b5893edf80a
Author: Sam Skjonsberg <skoneberg@gmail.com>
Date:   Mon Jul 14 16:26:21 2014 -0700

    add printDebug method for debugging templates
Version update on release
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.version
Version update on release
Version update on release