I think she is river song.
shes was good with guns and stuff and in the end of that episode she says something about im coming to find/get you"
Also in the recent episode river says "my old man didnt see that did he"