Working on v2 hotness
Merge branch 'master' of https://github.com/kevinclement/SimpleArmory