Merge branch 'master' into velvet
Revert "First pass at implementing strand information"

This reverts commit 960474090b15f5be6393a63e81c02205ca3275d7.
Merge pull request #31 from daisieh/velvet

Added -velvet flag (mostly for debugging): it redoes velvet assemblies on blast results generated from previous sTRAM runs.
Merge branch 'master' of https://github.com/juliema/TRAM

Conflicts:
	sTRAM.pl
Merge pull request #34 from daisieh/p33

Fixes #34
fix conflict
Merge branch 'master' of https://github.com/juliema/TRAM
Merge pull request #36 from daisieh/master

Not sure what keeps going wrong with my attempts to sync the forks...
still trying to sync forks...
Write out results table.
Fixes #40.
Printing complete contigs, etc., to log file.
merging from juliema