Seist/Skylight — pull request #30 by Decagon (2014-07-21 18:37:50+00:00)
Title: Development merge into master

If this messes up the new file organization then undo this merge!