I swear I'm done this time. Finishing touches....moment of truth.
Merge pull request #1 from kelseyobrien/master

I swear I'm done this time. Finishing touches....moment of truth.