Merge remote-tracking branch 'origin/social' into merge_social
added teradata as sponsor
Merge branch 'master' of http://github.com/codefordayton/labhack