Updated ST settings.
Trying out bitdeli.
Added git-merged-branches function.
Revert "Updated ST settings."

This reverts commit 0523940afe8b39b1757f58573a6644761c515f35.
Merge branch 'release/2.1.0'