Squashed commit of the following:

commit feba5f80addeadab56d624e85b5988d354d6859b
Author: vladikoff <vlad.filippov@gmail.com>
Date:   Sat Jun 7 15:52:53 2014 -0700

    Fix indent.

commit a79a920360d59de024408e528642d3fdccc8579c
Author: Stefan Klein <st.fankl.in@gmail.com>
Date:   Sat Mar 29 01:03:51 2014 +0100

    added option "expression" to uglify json and single functions

Closes gh-198.