Prevent errors when displaying flag icons for users that have not country set.
Fixed formatting and ruby hash syntax
Merge branch 'develop' of https://github.com/cbarratt/ensl.org into cbarratt-develop