changed naming scheme to reflect our choice
merge of travis changes

Merge branch 'master' of github.com:kfreedland/CS169GAP