Test travis #15

Merged
bpoldrack merged 2 commits from test-travis into master 2018-03-05 13:50:32 +00:00