pulling from derek
Merge branch 'development27' of github.com:trivett/tangochan into development27
ready for badges