Merge branch 'release/0.10'
checked in for review comments
fixed url patterns
Merge branch 'master' of github.com:runmycode/tyler into feature/issue8-companionpages
Merge branch 'feature/issue8-companionpages' into develop
Merge branch 'release/0.11'
Merging my version

adding the uncommitable changes I made to runmycode/tyler master to my
own fork, so we can deal with conflicts on major merges and not have to
struggle on EVERY commit.
Merge branch 'master' into develop