unminified for live debugging
upgrading to requirejs 2.1.6
fixing merge conflict
undoing domready plugin