Feature/streamlined price functions

Updated price functions - all now support recursive prices and whether or not to include tax. Also some streamlining.