Pulled lateset revision from GitHub - 6-11-2014
Fixed merge issues. Need to be up to date with new and edit locations