Remove Jon's copy
Update gitignore, will change to docroot
Update Travis YML...DUH
Merge pull request #2391 from openscholar/2100-make-new

Move 3.x to a new make file