functions.php Cleanup

Comments, cleans up, and simplifies one aspect (file inclusion) in
functions.php.
Fonts from latest Font Awesome