renamed and refactored a bunch of stuff.
extractor variable on etl is now a class rather than an instance.
Merge remote-tracking branch 'origin/master'
A bunch of small style changes.
Added searching to stickies. removed a bunch of unused code.
More styling.