Merge pull request #33 from pflannery/dev

Fixed combiner plugin version to stop null js files