Merge remote-tracking branch 'wamberg/feature/structural_refactor'
Merge remote-tracking branch 'origin/master'
change string concatenated DOM to use jquery to reduce the risk of XSS
Removed the hardcoding of both 'Recollection' and 'Viewshare' in strings, replaced with settings.SITE_NAME
Add dependency to django-celery. Load djcelery in settings.py.
Make sure the front page template inherits the parent templates final block -- uservoice was not being loaded
update requirements for django security fix, django-cms updates
Change default akara node
fix logic errors in password reset mechanism

* Use random hashes, rather than generating the same one per user
* Fix duplicate entry error when retrieving duplicate reset keys
* Form validation was checking for EmailAddress, while the reset logic was using user.email.  Standardize on user.email
* Make sure all appropriate variables are in the context for email rendering
* Fix language in the request acknowledgement template to reflect the use of a reset key
Create freemix.dataset.tasks.run_transaction to transform datasources into exhibit-compatible json asynchronously. Begin integrating this task into existing transaction process.
Break pollTransactionResults polling into it's own function called on DOM ready when polling for DataSourceTransaction results.
Split DOM manipulation and data retrival into different js objects for transaction polling.
Wire up basic client-side loading dialog while polling for transaction results.
Remove client-side poll limit from transaction polling. We'll let the client poll as long as they like.
Add dialog for $.ajax error during transaction polling.
Remove dialog box displayed while polling transaction results.
Pass DataSourceTransaction for owner to profile_detail template.
Display DataSource_Transaction models associated with a user on their profile page.
Select pending_datasets in viewshare.apps.profiles.views.profile more accurately. Change status display of pending dataset on user profile page.
Move client-side Transaction model to its own file to be reused on the user profile page.