include trailing slash in urls to avoid unnecesary redirects
Merge branch 'dev' into revamp-2014

Conflicts:
	source/_header.html.haml
Merge branch 'revamp-2014' of github.com:1uptalent/1uptalent.github.io into revamp-2014
Merge branch 'revamp-2014' of github.com:1uptalent/1uptalent.github.io into revamp-2014
Merge branch 'revamp-2014' of github.com:1uptalent/1uptalent.github.io into revamp-2014
DRY in layouts for fixing different fonts in site and blog
Generate blog feed xml
Merge branch 'dev' into revamp-2014

Conflicts:
	Gemfile