Changed the makefile to use C++14 draft. Can be changed to actual C++14 when Clang 3.5 becomes available.
Merge changes.