Add flaky marker, add keyword max_runs to marker

Can now mark tests with @pytest.mark.flaky(max_runs=3) to run a test up to 3 times. 
No longer need to specify reruns at command line. 
Do not need to include flaky marker in pytest.ini