Switching from engineering to www.talis.com
Merge branch 'adding_talis_sponsor' of https://github.com/talis/hackference-2014 into adding_talis_sponsor
Merge conflict fix
Merge branch 'talis-adding_talis_sponsor'