Merge remote-tracking branch 'upstream/master'
backbone to recent version
Merge remote-tracking branch 'upstream/master'
Merge pull request #63 from hjazz/backbone

backbone to recent version