Merge remote-tracking branch 'twitter/master' into poveropt

Conflicts:
	js/bootstrap-popover.js

diff --cc docs/javascript.html
Simple merge

diff --cc js/bootstrap-popover.js
index 128bc54127cd30a09bcbeb5a6f3de2134d36e809,c6377841574180408e41d74ea7f7040321033cf4..e8b49af3c2b599dfa72395ebe610ffb3cbf1816e
--- 1/js/bootstrap-popover.js
--- 2/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@@ -80,9 -81,10 +81,12 @@@
  
    $.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, {
      placement: 'right'
+   , content: 'data-content'
    , template: '<div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div>'
 +  , titleSelector: '.title'
 +  , contentSelector: '.content p'
    })
  
 -}( window.jQuery || window.ender );
+   $.fn.twipsy.rejectAttrOptions.push( 'content' )
+ 
 +}( window.jQuery || window.ender );

diff --cc js/bootstrap-twipsy.js
index 9eb6e79f4e5da346c214ae62aba0cace7386b723,5ebbddd675d2f7763048f32061072bdd84250b0d..24c1ced8c7da145ecd74066334860c0bdb686909
--- 1/js/bootstrap-twipsy.js
--- 2/js/bootstrap-twipsy.js
+++ b/js/bootstrap-twipsy.js
@@@ -302,11 -302,20 +302,21 @@@
    , title: 'title'
    , trigger: 'hover'
    , template: '<div class="twipsy-arrow"></div><div class="twipsy-inner"></div>'
 +  , contentSelector: '.twipsy-inner'
    }
  
+   $.fn.twipsy.rejectAttrOptions = [ 'title' ]
+ 
    $.fn.twipsy.elementOptions = function(ele, options) {
-     return $.extend({}, options, $(ele).data())
+     var data = $(ele).data()
+       , rejects = $.fn.twipsy.rejectAttrOptions
+       , i = rejects.length
+ 
+     while (i--) {
+       delete data[rejects[i]]
+     }
+ 
+     return $.extend({}, options, data)
    }
  
 -}( window.jQuery || window.ender );
 +}( window.jQuery || window.ender );