Add @Metric and deprecate @InjectMetric

Conflicts:
	src/main/java/com/ryantenney/metrics/spring/MetricsBeanPostProcessorFactory.java
	src/main/java/com/ryantenney/metrics/spring/config/AnnotationDrivenBeanDefinitionParser.java
	src/main/java/com/ryantenney/metrics/spring/config/annotation/MetricsConfigurationSupport.java
Merge pull request #58 from ryantenney/metric-annotation-2

Add @Metric and deprecate @InjectMetric

Resolves #38