Merge remote-tracking branch 'origin/sass'
Resolve conflicts
Removed extra directories after merge
Merge branch 'develop'
Set correct theme version
Created proper setup function

Added a setup function which hooks into genesis_setup and avoids the
need for including the parent framework’s init.php file. Also added a
filter for the favicon’s path.
Merge branch 'master' into develop