Merge pull request #5 from KellyBlack/master

Added a copyright notice to the readme file.
Simulation update
Merge remote-tracking branch 'origin' into linton_dev
Clean files from the merge off of github