Updated to latest version

Just resolved conflicts with latest version of jquery-backstretch so it can be more easily merged.