Adding yet another jquery for now til we get bower sorted out
Initial work to make geogit and time optional
handle for GEOGIT_DATASTORE in feature_edit_check
Skip time step if not selected
Add GEOGIT_DATASTORE and UPLOADER_SHOW_TIME_STEP to local_settings.py sample
Some cleanup
add update categories command
Fix typo in geonode/layers/views.py (tests pass)
Merge branch 'master' of github.com:jj0hns0n/geonode into upload-work

Conflicts:
Merge pull request #915 from simod/master

Add updatecategories command
Changes to feature_edit_check logic per @ischneider
Use store_type vs type
Set all optional settings to False in local_settings.py and add UPLOADER_BACKEND setting
Merge pull request #918 from jj0hns0n/master

Clean up jquery libs
Merge pull request #912 from jj0hns0n/upload-work

Continued work on making the importer based uploader work with time and geogit datastores