Merge branch 'bugfix/trws/travis-make-limit' of github.com:llnl/raja into bugfix/trws/travis-make-limit