merge fixed address validations
Merge pull request #21 from bobolinks-2014/merge_issues

merge fixed address validations
minor merge issue
merge conflicts