adding additional IDE files to global .gitignore
Merge pull request #1759 from edx/talbs/update-gitignore

Adding Codekit IDE assets/config to .gitignore
Merge pull request #1756 from edx/will/devstack-view-live

Added LMS_BASE to devstack settings to enable View Live in Studio
Merge pull request #1604 from edx/jarv/verified-certs

Jarv/verified certs
Add feature to do auto signup with external auth
This adds a feature flag: AUTH_USE_MIT_CERTIFICATES_IMMEDIATE_SIGNUP
that does an automatic signup of users if they are using external authentcation.
Fixed PEP8 and indentation issues
Merge pull request #1752 from edx/gprice/inline-discussion-error-recovery

Add error recovery to inline discussion loading
Added tests for signup skipping
Turned back on several Video Jasmine tests.

BLD-463
Merge pull request #1711 from edx/valera/enable_all_video_jasmine_tests

Enable all video Jasmine tests
Convert edit_subsection, edit_unit, and publishing to RESTful URLs.

STUD-844
Updates from code review. Includes backing out the
"as_published" changes I previously put in, as now we
are not adding @draft to locations converted from locators.
Refunding CertificateItem now marks parent Order refunded as well
Merge pull request #1728 from edx/christina/components

Convert component.py to use RESTful URLs.
Merge pull request #1766 from edx/flowerhack/fix/order-and-orderitem-refunds

Refunding CertificateItem now marks parent Order refunded as well
Revert PR 1711; disabling JS tests again
Merge pull request #1767 from edx/will/revert-1711

Revert PR 1711; disabling JS tests again
Merged master to rc/2013-11-21
Fix CHANGELOG conflicts again.
fixed the path to the header example image in the Studio html editor help sidebar
STUD-981