Merge branch '2014' of github.com:pxgrid/nodefest into 2014

Conflicts:
	src/includes/header.hbs
Merge branch '2014' of github.com:nodefest/nodefest.github.com into 2014