Merge branch 'options'

* options:
  fix(options): Corrected (PROPERLY) the way to update options in realtime
  fix(options): Corrected bug introduced by live-watching the options

Author: Dean Sofer

src/sortable.js

@@ -10,9 +10,13 @@ angular.module('ui.sortable', []).value('uiSortableConfig',{}).directive('uiSort
       link: function(scope, element, attrs, ngModel) {
         var onReceive, onRemove, onStart, onStop, onUpdate, opts = {};
 
-        attrs.$observe('ui-sortable', function(){
-          angular.extend(opts, uiSortableConfig, scope.$eval(attrs.uiSortable));
-        });
+        angular.extend(opts, uiSortableConfig);
+
+        scope.$watch(attrs.uiSortable, function(newVal, oldVal){
+          angular.forEach(newVal, function(value, key){
+            element.sortable('option', key, value);
+          });
+        }, true);
 
         if (ngModel) {