Removed redundant comment
Added other shim that doesn't use log()
Removed redundant shim
Less options

Some are deprecated, others have no real purpose
Bumped, fixed url
general and specific text changes for patch update
Cleaned up a bit
Updated to jQuery 1.11.1
Now using Apache Server Config 2.6.0
Added disallow
Merge branch 'patch-bugfixes'
Merge remote-tracking branch 'upstream/master' into patch-bugfixes

Conflicts:
	README.md
	assets/js/libs/_jquery-1.11.0.js
	assets/js/libs/_jquery-1.11.1.js
	assets/js/libs/jquery-1.11.0.js
	assets/sass/_ie.scss
	config.json
	misc/htaccess.txt
Merge branch 'patch-bugfixes'