Merge pull request #87 from rbowen/20140424

OpenStack Heat hangout updates
Adding DockerCon
Cincinnati Dojo
Adding SELF 2014
adding txlf