cleanup
merged master into blastx
Merge branch 'blastx' of github.com:benjiec/giraffe into blastx