Merge branch 'master' into skyler
Fixed FilteredDocument ChartSet shit
Minor adjustments

- imports removed
- changed return string from String to StringBuffer (more efficient)
- moved string building loop outside of try block
Merge remote-tracking branch 'origin/skyler' into zack