Merge pull request #33 from anthcor/master

refactoring and some doc edits
Adding travis.yml to project
Merge branch 'master' of github.com:cmu-is-projects/ferry
Adding .DS_Store to gitignore
Adding to the travis.yml file