Merge pull request #49 from larister/master

Removed placeholder, added Nodebar deets
Added placeholder for Matt Gaunt talk, including details about Coldfront conf giveaway