Merge branch 'master' of git://github.com/modality/hearst
some more pretty
Merge branch 'master' of git://github.com/ashleygwilliams/hearst

Conflicts:
	views/index.haml