fix assembler-specific option parsing
flush
Merge branch 'master' of github.com:blahah/assemblotron into upstream

Conflicts:
	bin/atron
	lib/assemblotron.rb
merged changes from blahah