Moves equipment-only components to Equipment
Merge branch 'master' of https://github.com/anathema/anathema