Merge branch 'badges-tab', remote-tracking branch 'origin' into badges-tab
Merge branch 'master' of github.com:jchristianhall/vigor into badges-tab

Updating with master
Badges adjustments
Merge branch 'badges-tab'

Master merge
Merge branch 'master' of github.com:jchristianhall/vigor

PLEASE MERGE