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.