adding some aliases
adding some aliases
fixing dead links
merging changes
adding aliases
Merge branch 'master' into gh-pages