Working on rendering setup
Removed includes dir
Merge branch 'master' into rendering

Merge minor changes into rendering branch.
Switched out ellipsis function for newer version.
Fix silly webkit-specific properties.
new jquery version