on the academy FAQ and class FAQ pages: updated a broken link
on the 404 page: removed an extra period in the title
Merge branch 'master' of github.com:masondesu/cool-new-ironyard-site into eric-fix-branch
added redirect for /houston
Merge pull request #66 from masondesu/eric-fix-branch

several updates
Merge pull request #67 from masondesu/to-do

changed deadline for Durham scholarships
updated the locations page
updated the atlanta page
updated the class pages
Merge pull request #68 from masondesu/eric-fix-branch

made site updates
on the tampa page: updated the city highlights section
on the tampa page: updated copy in the intro section
on the tampa page: updated copy in the academy section
on the tampa page: updated copy in the kids classes section
on the tampa page: updated the email address and news letter name
Merge pull request #69 from masondesu/eric-fix-branch

Copy changes on the Tampa page
on the tampa-st pete page: updated the blog feed
Merge pull request #70 from masondesu/eric-fix-branch

on the tampa-st pete page: updated the blog feed
on the tampa-st-pete page: updated the header image
on the locations page: updated copy in the Tampa-st-pete description