Merge branch 'master' into irjudson

Conflicts:
	codalab/apps/web/static/foundation/css/codalab.css
	codalab/apps/web/templates/base.html
Back to one row per submission in the submission table
Clean up submission table and leaderboard to support previous results
styling competitions results tab
updated bundles/worksheet prototype (doesn't affet website) to generate HTML for nested macros
command-line prototype
update text on the about page regarding the experimental platform
Commented out Experiments link in header nav.  Fixes #165
Removed link to experiments section from icon on homepage
Make view dependent on phase status
Add placeholder to insert script elements in templates derived from this base
implement delete, other improvements
Merge branch 'master' of github.com:codalab/codalab
Added .selected class in CSS to indicate selected button on competition results tab. Fixes #171
Merge branch 'master' of https://github.com/codalab/codalab
adapted code to use Bundle/Dep classes; support flexible search for bundles
Merge branch 'master' of github.com:codalab/codalab
support cat for displaying files
support waiting for Bundle to finish running; minor changes
Adjust logic for active state of competition and phases