some new pages and links changed
woot!
Merge remote-tracking branch 'origin/master'