Fixed badges
MNT: Update coveragerc to match rename
Merge pull request #195 from ericdill/fix_coverage

MNT: Update coveragerc to match rename
ENH: Changes to coveralls and copied contrib guide from skimage
Update contributing.txt
update elastic function
update compton function
Merge pull request #196 from ericdill/fix_coverage

ENH: Changes to coveralls and copied contrib guide from skimage
correct test files
more tests
remove +
Merge pull request #200 from licode/update_lineshapes

Update lineshapes
DOC: Fixed docstring
Merge pull request #201 from tacaswell/conda_work

Conda work
TST : use bleeding-edge git on travis