Merge remote-tracking branch 'jj0hns0n/issue-469'
Merge remote-tracking branch 'jj0hns0n/issue-464'
Merge branch 'master' of github.com:opengeo/mapstory
uploader - handle non-json error correctly
filter incomplete profile fixes

try to resolve avatar at gravatar if no primary uploaded one exists
mark profile incomplete on user creation
add test for profile incomplete