Seist/Skylight — pull request #26 by Decagon (2014-07-21 12:29:50+00:00)
Title: Develop merge

Just the develop branch so it shouldn't affect anything going on in the master one.