Merge in latest screen.less etc. from gh-pages branch.
Localhost-afied index.haml/html
Merge branch 'localhost' of https://github.com/mfreema5/COM530-tumblr into localhost