Remove index.html
Clean up rspec tests
Merge branch 'filling-in-layout'