badge framework refactor and changed the way properties are set
merge from master
Merge branch 'master' of github.com:surevine/neon