deleting left over html
converting index to HAML
deleting erb file and converting to haml
merge from upstream