fixing stuff in 2.1
added some more to 2.1.1
Merge branch 'master' of github.com:joelcw/tyneside