holy balzac it works
Merge branch 'master' of http://github.com/danarnold/tripninja