#387 adding bootlint to travis
Merge pull request #426 from MaxCDN/travis_bootlint

#387 adding bootlint to travis
Merge branch 'develop' into html-validator

Conflicts:
	Makefile