I suck at this...

Problems solved
Merge branch 'master' of https://github.com/joe-sullivan/TUSK