Merge branch 'master' of github.com:jnf/blinder into pks/auto_signin_before_filter

Conflicts:
	app/views/layouts/application.html.haml