Merge branch 'hotfix/htaccess'
Merge branch 'hotfix/ey-hook'

Merge engine yard changes
Revert scn-social-auth update
Added EY config
Merge branch 'hotfix/deps' into develop