lint
updated links
Merge pull request #1 from tlivings/master

linting and links