Merge pull request #2 from dan-v/master

Breaking things
updating headers to match other pages
Add media upload and admin wysiwyg support.