add nav structure
Merge branch 'master' into style

Conflicts:
	layouts/default.haml
style nav links
add 'alternate' link to header for Atom feed'
add padding to nav
add alternate link for rss+xml, remove nav bar for now
add 'more' tag to default post template'
Merge branch 'master' into posts
draft 1
update post date of 'new site' post
edits
edits
merge
switch to susy
changed to a more semantic structure
Merge branch 'semantic'

Conflicts:
	content/stylesheets/partials/_base.scss
	content/stylesheets/screen.scss
	layouts/default.haml
	layouts/post.haml
Merge branch 'master' into devel
tweaks and retweaks to structure and style
Merge branch 'master' into posts
fix structure of twitter follow script