Fixed modal behaviour: now allows different modals to fire on the same page
Merging master into gh-pages