Check for template_include passing non-strings. Fixes #1134
Fixing dead variables and params
Removing dead variables in activation
Declaring properties on Roots_Wrapping
Merge pull request #1136 from tomdxw/feature/1134-template_include

Check for template_include passing non-strings. Fixes #1134
Updating npm dependencies
Store display_sidebar in static variable
Merge pull request #1196 from QWp6t/master

Store display_sidebar in static variable
Move wp_head() to be the last markup before </head>
Merge pull request #1199 from kalenjohnson/master

Updating npm dependencies
Merge pull request #1204 from CFXd/move-wp_head-last

Move wp_head() to be the last markup before </head>
Merge pull request #1191 from alexsomeoddpilot/unused-parameters

Unused parameters and declared properties
Bump to 3.3.1

Just bumpin'.
Merge pull request #1209 from markthethomas/patch-1

Bump Bootstrap to 3.3.1
Merge branch 'master' of https://github.com/roots/roots

Signed-off-by: Shaun Burrell <info@grindpress.com>

Conflicts:
	bower.json
	lib/config.php