Merge branch 'develop' of https://github.com/AgileVentures/codealia into develop
changes in travis.yml to get CD working
Merge branch 'fixes' of https://github.com/tochman/codealia into fixes
Made a few changes to travis.yml