Bumping version to 2.0.2
Merge branch 'master' of github.com:nomad/houston
Squashed commit of the following:

commit 3a4f5b397aa31d6346c235b4082eb945c9ad50b0
Author: Mattt Thompson <m@mattt.me>
Date:   Mon May 12 11:48:20 2014 -0700

    Minor refactoring

commit 1f155b3e21850a6e357319dc1eecd644c67949a7
Merge: bedc48f d244795
Author: Mattt Thompson <m@mattt.me>
Date:   Mon May 12 11:44:06 2014 -0700

    Merge branch 'sent-unsent' of github.com:aj0strow/houston into aj0strow-sent-unsent

commit d2447953bf01e47231f70cfd0f06d10389f50e26
Author: AJ Ostrow <alexander.ostrow@gmail.com>
Date:   Fri Apr 18 13:26:17 2014 -0400

    Fix and format sent and unsent messages

Signed-off-by: Mattt Thompson <m@mattt.me>