Squashed commit of the following:

commit a8a2783728785fc5e92ad924dc8f22ed646fb6c4
Author: Micah N Gorrell <github@minego.net>
Date:   Tue Feb 26 19:00:08 2013 -0700

    Merged changes from Project Macaw to support the Twitter 1.1 API before the 1.0 API is disabled