Merge pull request #40 from jrmontag/master

more tests, new Makefile
add labels for all twitter extractors, clean out old comments