Added lookup() to Sample class
Revert separate Asp/Disp/Mix queues in optimization

Separate queues didn't work right -- could have out of order operations
such as during manual mix where ADADAD became AAADDD
Returned to only 2 fixed tips
.gitignore additions