Merge pull request #222 from masondesu/eric

updated addresses on the contact page
updated the jobs page