Fix the user hash
Merge branch 'master' of git://github.com/mgmllr/hearst

Conflicts:
	views/index.haml
Merge branch 'master' of github.com:modality/hearst

Conflicts:
	views/index.haml