Merge branch 'master' into dev

* master:
  Remove dependencies on dplyr and magrittr
  Wrap to 80
  No need to reorder
  Rewrote testing conditions
  Remove use of dplyr and magrittr
  Lower case the upper case object names
  Rewrote roxygen.
  man files for the cost functions
  Updated NAMESPACE with new imports of libraries and exported functions
  Added functions for data consumption, pricing, and cost calculation.
  Add imports of dplyr, magrittr, and lubridate
  Unit tests for cost and pricing functions
  Default config file loading path portable to Windows OS

# Conflicts:
#	NAMESPACE

DESCRIPTION

@@ -2,8 +2,8 @@ Package: AzureSMR
 Title: Manage and Interact with Azure Resources
 Description: Helps users to manage Azure Services and objects from within an
     R Session. This includes Azure Storage (e.g. containers and blobs), Virtual
-    Machines and HDInsight (Spark, Hive). To use the package, you must configure 
-	an Azure Active Directory application and service principal in the Azure portal.
+    Machines and HDInsight (Spark, Hive). To use the package, you must configure an
+    Azure Active Directory application and service principal in the Azure portal.
 Type: Package
 Version: 0.2.5
 Date: 2017-06-06
@@ -18,16 +18,17 @@ URL: https://github.com/Microsoft/AzureSMR
 BugReports: https://github.com/Microsoft/AzureSMR/issues
 NeedsCompilation: no
 Imports:
-	assertthat,
+    assertthat,
     httr,
     jsonlite,
     XML,
     base64enc,
     digest,
-	shiny (>= 0.13),
-	miniUI (>= 0.1.1),
-	rstudioapi (>= 0.5),
-	DT
+    shiny (>= 0.13),
+    miniUI (>= 0.1.1),
+    rstudioapi (>= 0.5),
+    DT,
+    lubridate,
 Depends:
     R(>= 3.0.0)
 Suggests: