changed blog list style again
Merge branch 'master' into server

Conflicts:
	Gruntfile.js
	src/coffee/app.coffee
	src/coffee/blog/controllers/controllers.coffee
	src/coffee/blog/directives/blognav.coffee
	src/coffee/blog/directives/blogslug.coffee
	src/stylus/blog.styl
Merge branch 'server' of https://github.com/thetmkay/joji into server