updated to reflect Thomas Wingo's modifications
Merge branch 'dev' of https://github.com/virenp/seqant into dev

Merging the repo with Matthew's recent updates