Changed "optiflow" to "opticalFlow" for consisetency.
Merge branch 'flock' into Modularize
Merge branch 'Modularize' of https://github.com/strixcuriosus/Synesthesia into Modularize
Deleted explicit instantiations of sockets for shakemeter and shakebattel.