misc amazing updates
Merge branch 'shelbys' of github.com:jhendley25/tiyapi into shelbys
tons of awesomeness