ignore swo swp files
new banner
Merge branch '2014' of github.com:jasl/rubyconfchina.org into 2014

Conflicts:
	source/layouts/layout.erb