Add Pig and Hive brushes.
Fix formatting
Merge branch 'develop'