Merge remote-tracking branch 'upstream/master' into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
readme update
Initial batch of IU-specific edits.

After forking the repo, this commit represents the first set of changes
we had implemented prior to officially forking the repository. This
will allow us to merge Ken’s updates and changes with our own,
retaining a relationship between the repositories. See the
readme-oidd.txt file for summary of IU changes.
Adding a couple files previously ignored

Adding config.php and js/tools_variables.js to repo; had been in
gitignore
Upgrade Icons

Adding icons for Font Awesome 4.2 as well as some new Canvas icons
Output Buffer Fix
Minor global css/js and tools_variables updates
Merge branch 'develop'
merged with upstream
Merge branch 'develop'
Replace USU info with IU info in tools_variables
Merge branch 'develop'
Merge branch 'develop'