Merge pull request #2 from russdanner/master

Most of the basics are working
Merge branch 'master' of https://github.com/craftercms/studio2