Merge pull request #1 from rightthisminute/master

Get updates from RightThisMinute repo.
Merge pull request #1 from donut/master

Merge pull request #1 from rightthisminute/master