Added obspy fk analysis
limit visible events in map to visible events in viewer
Merge branch 'master' of https://github.com/emolch/contrib-snufflings
some plot improvements

Conflicts:
	time_line.py
Merge branch 'master' of github.com:emolch/contrib-snufflings into timeline
date ticks
added time line info
Added time line info to README
Merge pull request #8 from HerrMuellerluedenscheid/timeline

Timeline
added setup.py
added --choice=snuff1.py,snuff*.py option
added "Extract Events" snuffling
Merge branch 'master' of github.com:emolch/contrib-snufflings

Conflicts:
	README.md
added some docs
Merge pull request #10 from HerrMuellerluedenscheid/uplink

Automatically link snufflings
remove setup.py from files to link
improved file selection
Merge pull request #12 from HerrMuellerluedenscheid/uplink

better linking
Merge branch 'master' of https://github.com/emolch/contrib-snufflings
Merge branch 'master' of github.com:HerrMuellerluedenscheid/contrib-snufflings