Merge branch 'linux' of github.com:dlecan/gitstuff into linux