Changed twitter bootstrap version constraint, fixes #117
Merge branch 'bower-fix' of github.com:acrobat/bootstrap-markdown into bower-fix

Conflicts:
	bower.json