fixed jshint, lint issues & upgraded packages. closes #26
Merge pull request #27 from lwhiteley/develop

Merge develop into master