travis updating
travis
gem installed activesupport
merging master changes for travis ci
Please enter a commit message to explain why this merge is necessary,
Merge remote-tracking branch 'upstream/master'
Merge pull request #24 from aedwards12/master

added travis files- restructured directory