Updated makeX and make_test_data

Updated R scripts to allow use of both matchup statistics and team
statistics to make X and test matrices.