Get line numbers to behave.
add header extra args
Adjust css to properly handle line numbered code blocks.
remove extra sidebar include in article
Adjusted CSS to properly display line numbers in codeblocks.
Adjust CSS so codeblock line numbers display correctly.
Merge branch 'csslinenums'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:cjp/pelican-octopress-theme

Conflicts:
	static/css/main.css