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
Testing if deploy works
Deploy works now. REverted travis to correct api keys
Added Git Strategy
Merge branch 'develop' of https://github.com/AgileVentures/codealia into develop

Conflicts:
	.travis.yml
Merge pull request #20 from sampritipanda/develop

Fixed Issues with Travis Continuous Deployment