Turned build into primarily 1.6.4 support with 1.7 protocol support added

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>