Merge pull request #1 from jarednova/master

Pull from jarednova:master
phpdoc
Merge: result of auto merge
Merge: cleaned-up merge in functions-twig
Merge: resolved conflicts in timber-image-helper
Merge: resolved conflicts in timber-helper
moved rest of phpdocs comments into respective helper files
resolved conflict in timber-image.php
Merge: resolved conflict in timber-image.php
Merge: resolved conflict in timber-post.php
resolved errors in tests from TimberImageHelper::hexrgb