Merge pull request #1 from bzavala/bzavala/vendor-fix

Bzavala/vendor fix
Merge pull request #2 from bzavala/bzavala/readmeupdate

Bzavala/readmeupdate
configures Grunt for watching / livereloading
Merge pull request #1 from joeLepper/master

trying to merge joe's changes to my forked repo