Merge branch 'master', remote-tracking branch 'origin' into bttf
add framework for N unit types
add framework for N unit types
clean up
Merge branch 'conversions' of git://github.com/elohmrow/zeroclickinfo-goodies into mintsoft/conversions
Conversions: adding hack for if the user specifies "in" within the query (e.g. 25 cm in metres)
Conversions: adding support for "25cm" to act the same as "25 cm"
Conversions: Adding time/duration support (this can be expanded massively!)
Conversions: Removing microsign from aliases, seems to cause issues on travis
Conversions: making the units and search check the unit name as well as aliases, removes the need to duplicate the unit in aliases
Conversions: adding supercool astronomical units (ly, pc, au)
some general fixes per @jagtalon 2014-02-24
Merge branch 'conversions' of git://github.com/elohmrow/zeroclickinfo-goodies into mintsoft/conversions

Conflicts:
	lib/DDG/Goodie/Conversions.pm
	t/Conversions.t
Conversions: Renaming @durations to @time
more tests - check for not matching Inf, NaN, etc.
Merge branch 'conversions' of git://github.com/elohmrow/zeroclickinfo-goodies into mintsoft/conversions

Conflicts:
	lib/DDG/Goodie/Conversions.pm
Conversions: Adding pressure
Conversions: Removing debugging
Conversions: Adding very hacky support for " and ' as units: this needs refactoring
Conversions: Adding regex guard to queries