- Removed commented out code.
Merge branch 'armtest2' of https://github.com/astrellon/moss into armtest2
- Added conditionals and most of the support needed for assembling.