Merge branch 'master' of github.com:dragonhoard/dragon-hoard
Merge branch 'master' of github.com:m3talsmith/dragon-hoard
Merge branch 'master' of github.com:dragonhoard/dragon-hoard
using User#find_by_query; formatted find result differently