Merge pull request #2 from bradp/master

updated footer links
Functions.php clean up
Upstream changes from _s