Merge pull request #15 from haysclark/master

Adding additional LiveTemplates
Merge branch 'master' into gettersetter