Standardized the tabs and spaces usage (2 spaces per tab)
jshint style cleanup
fix merge
Merge remote-tracking branch 'upstream/apache-blur-0.2' into apache-blur-0.2