Bug fixes galore
Merge branch 'master' of github.com:spacenut/tumbleweed