Added None option for baits
Cleanup files
Added new analytics system (TODO: clean up my mess again)
Fixes #26
Fixes #27
Merge branch 'develop'