akimboio/sleepy — pull request #35 by dustincannon (2013-01-14 18:47:50+00:00)
Title: Bring develop up to date with changes from master

Note: All these changes already exist on the master branch so they should be good to merge right away.