Updating installation instructions
Merged readmes to incorporate shawns additions
Merge branch 'shawn-sterling-master'

Conflicts:
	README.md