Merge pull request #1539 from zz9pzza/issue_3926

NULL change
minor tweak that removes double call to pry
Merge pull request #1540 from shalott/fix_pry_gemfile_warning

minor tweak that removes double call to pry
Merge branch 'master' of git://github.com/otwcode/otwarchive into issue_3926
First draft of codeship prepare script