Fixed typo which disabled spec:yasm from working
cleared rakefile merge conflict
got feature and tests passing for :intel setting, and it's default
Merge branch 'master' of github.com:TheNotary/ronin-asm