Readme update
Fixed conflicts
Merge branch 'master' of github.com:alexwyett/aw-form-fields