Minor clean up
Merge branch 'master' of github.com:ushahidi/uchaguzi
Merge branch 'master' of github.com:ushahidi/uchaguzi