trinity r20140717

Closes #1282.

Signed-off-by: Ian Lancaster <ilancaster@gmail.com>
trinity: update r20140717 bottle.
samtools-0.1: use conflicts_with newer tools