Updating include/El/core.hpp to include View.hpp from the correct location
Moving 'Merge' routines into src/ and adding C wrappers
Merge branch 'master' of git://github.com/elemental/Elemental