Fix travis build
Move scripts into folder
Merge branch '7.x-2.x' of github.com:phase2/openatrium into 7.x-2.x
Remove extra travis script
Remove extra old scripts