add sanity check in Media::asset()
Updated Request::env() to account for servers that do not set the SERVER_ADDR environment variable. If SERVER_ADDR isn't present, Request::env() returns LOCAL_ADDR. Provoked specifically by IIS 7
Fixing a few typos and grammatical errors
Merge pull request #391 from pixelcog/master

Quick fix for misnamed variable and some comment grammar fixes
Unused variable
Merge pull request #399 from jails/pr2

Unused variable $lines
Merge branch 'dev'

Conflicts:
	net/http/Response.php
Allowing zero-valued options and the empty param to play nice with each other in the select form helper.
Merge pull request #421 from toomuchpete/zero_value_options

Allowing zero-valued options and the empty param to play nice
When checking for 'selected' always cast to a string, because there's no other datatype that can be represented uniqely in an html attribute.
Adding tests for select helper int/string agnosticism
Refactoring tests to remove inline comments, per Nate's request.
Fixing a similar/related issue with checkboxes and dot-notation.
Fixing indentation; spaces => tabs.
Less skipped tests for PHP5.4 with Travis
Merge pull request #425 from mehlah/ci-updates

Ci updates
Updated to check if LOCAL_ADDR is set in the case that SERVER_ADDR isn't available. Present in IIS 7.5
do not call ini_set if session is active in Php adapter.
Synchronize documented defaults in `String::insert()`.
Fixed syntax error in documentation, missing closing '