Fixed __unicode__ method
Merge branch 'master' of github.com:anti-social/solar