Reverting to Master as Baseline

This corrects the errors made in previous commits,
by replacing all files with the files in the master
branch as of August 10th, 2014. Provides a baseline
to change to if erroneous commits are made in the
future.