Git version for further development
Fix for travis config
Merge branch 'master' into dev

Conflicts:
	setup.py
Tweak versioning
misc pyflakes fixes
Add taxtable.TaxNode.drop
Added collapsing functionality and ability to write out minimalistic seqinfo files
Update definitions for collapse and write_seqinfo
Update changelog
- add 'taxit merge'
- identify seqnames with unknown taxids using 'taxit update_taxids --unknowns'
pyflakes fixes; remove non-functioning test
Initial work on is_valid
Implement unclassified marker
Tweak UNCLASSIFIED_PATTERNS, add unit test

New expressions from @nhoffman; make all literals raw strings; break
regex components into a list for more informative testing.

Test included tries all regex components against all type strains from
the SILVA living tree project.

The commented out version dynamically generates a test class with a separate
unit test for each species. This is useful for development, but adds
9000+ tests, so skipped for now.
Require sqlalchemy >= 0.7
Drop some debugging code

[ci skip]
add "taxit composition"
Fix `taxit lonelynodes`

And add unit test
Merge pull request #59 from fhcrc/59-is-classified

is_classified should operate on species name only instead of each tax_name

Closes #59
CHANGELOG