fix the urls to be shorter
merge and update gitignore