Directory structure changed for middleman transition
Merge branch 'working' into middleman_test

Conflicts:
	Gemfile
	config.rb
	source/_sass/styles.scss
Starting from scratch with middleman, html5boilerplate, haml (the bitch), and scss
Styles completed; layouts begun in haml
Converted journal entries to haml; added middleman-blog
Added index lists to index.html and /journal/index.html