build with latest hadoop/hbase
Merge branch 'master' of https://github.com/macmarcin/brickhouse into macmarcin-master

Conflicts:
	pom.xml
	src/main/java/brickhouse/udf/date/AddHoursUDF.java
Merge branch 'macmarcin-master'