moved to modularization
fixed merge conflict
Merge branch 'master' of github.com:jacobwagner/rpcsqa