Newest Copy 10-29-2014

Fixed a couple of thing and edited some others but nothing major just
newest copy.
~jn
Merge branch 'master' of https://github.com/CTCfreelancers/team