Added unit tests for ParseS3Zip methods
Merge branch 'feature/s3-upload' into develop

Completion of Phase 2
Merge branch 'feature/code_review_001' into develop

Merging Ryans changes for Phase 2

Conflicts:
	app/controllers/bulk_uploads_controller.rb
	app/models/bulk_upload.rb
	app/uploaders/file_uploader.rb
	app/views/bulk_uploads/new.html.erb
	app/views/file_uploads/new.html.erb
	db/schema.rb
Cleaned up conflicts
full implementation of specification, caveat: image not being resized on upload
implemented InternalPageLink model
initial administration of internal page links + redcarpet renderer implementation
implemented internal page link rendering
cleaned up navbar
Added edit and delete functionality to internal_link panel
cleaned up panel styling
Bug fix: the photo direct upload form should accept a :file input regardless of the field name on the PagePhoto model - this is a restriction by AWS
Updated Carrierwave initializer to bring it inline with main codebase
Updated local_image_upload to use :photo attribute
Updated PagePhoto model to use photo field correctly
Updated gitignore file to prevent committing uploads / env files
Removed old spec
Improved routing by using restful resources rather than manual mapping
Simplified navigation
Fixes for photo upload