update baseurl to url
update sass to work in a jekyll 2.x context
updating scripts
update sidebar code to use where statement
move prose to its own config file
update content to collections
add meta-data to header
update the way authors are recorded on discussions
add content
fix sitemap page
fix up contributors page
add disqus commenting
add treaty tracker
update background image
move out of src directory for gh-pages

Signed-off-by: budparr <budparr@sonnetmedia.net>
Merge branch 'gh-pages' into june-2014-client-requests

Signed-off-by: budparr <budparr@sonnetmedia.net>

Conflicts:
	_topic-background/treaties-political-positions.md
add topic merge

Signed-off-by: budparr <budparr@sonnetmedia.net>
Merge pull request #10 from iliadx/june-2014-client-requests

June 2014 client requests