:lipstick:
Merge branch 'master' of github.com:UniversityRadioYork/playslave-plusplus

Conflicts:
	main.cpp
	player/player.hpp
	player/player_state.cpp
Fix silly errors introduced by using VS.
Reformat ALL the things.
Remove IfIn().

This was a somewhat indefensible usage of C++11 lambdas, and
removing them improves the readability of the code.