Merge branch 'master' of https://github.com/firebrandmedia/AbbyHopkins.com

Various fixes to code.
Merge branch 'master' of https://github.com/firebrandmedia/AbbyHopkins.com