ENH: combine norm functions, take axis argument
Merge pull request #334 from adamrp/norm

ENH: combine norm functions, take axis argument
Merging upstream master