Changed to not add trailing slashes, updated urls accordingly

This is needed for bootstrap to work with the urls

Trying to rebase my local into the remote master branch
Trying to merge now, please work