Merge this

@dieschwarzekobra, we did a merge from SILShack into our own repos at one point.  I think that you merging this (by scrolling down to the bottom and pressing the green merge button twice) should fix that.

This pull request I've created is from the main repo into your repo.  
![screen shot 2013-09-10 at 9 21 42 am](https://f.cloud.github.com/assets/1702745/1114579/f595175c-1a1b-11e3-8c90-47e67fa1ef35.jpg)

The opposite direction than what we usually do.  Let me know if you have any questions!