Add oracle dependency
Use HTTPS for googleapi resources
Use any version of Django 1.4
updated readme with correct links
added link to live site
Don't do oracle by default
Different requirements under oracle
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/base-desktop.html
	templates/base-mobile-subpage.html
	templates/base-mobile.html
UIUC interface updates
Merge from master. Re-license and more agressive caching of generated
images.
Added UnpatchVaryMiddleware from sbutler's fork (looks like this was forgotten in the pull request?) Looks like it improves image caching considerably.
Merge branch 'master' into uiuc_merge
Merge branch 'master' into uiuc_merge
Merge branch 'master' into uiuc_merge

Conflicts:
	static/css/mobile.less
	templates/app.html
	templates/mobile/app.html

I had to add a '}' to mobile.less.
Merge branch 'master' into uiuc_merge
Merge branch 'master' of github.com:uw-it-aca/spacescout_web
Merge branch 'master' into uiuc_merge
Merge branch 'master' into uiuc_merge
Merge branch 'master' of github.com:abztrakt/spacescout_web
Merge branch 'uiuc_merge' of github.com:abztrakt/spacescout_web into uiuc