fixed sprint branch
Merge branch 'sprint' of github.com:jacobwagner/rpcsqa into sprint
got rid of mess