remove some ide junk and conflict file

also added to .gitignore to keep it from reappearing
added "link" to albums

albums was erroring saying key "link" was not valid, this adds link to
schema