diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..05fa7f9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+.gitattributes export-ignore  
+.gitignore export-ignore
+.travis.yml export-ignore
+Makefile export-ignore
+phpunit.xml.dist export-ignore
+/tests export-ignore  
diff --git a/.gitignore b/.gitignore
index f269a1b..4bc68d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 composer.lock
 composer.phar
 docs
-vendor
\ No newline at end of file
+vendor
+
diff --git a/.travis.yml b/.travis.yml
index ae279ff..520770d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,9 @@ php:
 
 matrix:
   allow_failures:
-    - php: 5.6
     - php: hhvm
 
 before_script:
   - composer self-update
   - composer install --no-interaction --prefer-source --dev
+
diff --git a/LICENSE b/LICENSE
index 763bdaa..372992f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -27,4 +27,5 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/Makefile b/Makefile
index c91af08..2551baa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,11 @@
-vendor: composer.phar
-	@php composer.phar install --prefer-source --dev
+vendor:
+	@composer install --prefer-source --dev
 
-composer.phar:
-	@echo "Installing composer..."
-	@curl -s https://getcomposer.org/installer | php
-
-update: vendor
-	@php composer.phar update --prefer-source --dev
+update:
+	@composer update --prefer-source --dev
 
 autoload: vendor
-	@php composer.phar dump-autoload
+	@composer dump-autoload
 
 test: vendor
 	@phpunit
@@ -28,4 +24,5 @@ clean:
 	@rm -fR docs
 	@rm -fR vendor
 	@rm -f composer.lock
-	@rm -f composer.phar
\ No newline at end of file
+	@rm -f composer.phar
+
diff --git a/README.md b/README.md
index 7f4d19b..b21d642 100644
--- a/README.md
+++ b/README.md
@@ -296,4 +296,5 @@ ICanBoogie/DateTime is licensed under the New BSD License - See the [LICENSE](ht
 
 [DateTime]: http://icanboogie.org/docs/class-ICanBoogie.DateTime.html
 [TimeZone]: http://icanboogie.org/docs/class-ICanBoogie.TimeZone.html)
-[TimeZoneLocation]: http://icanboogie.org/docs/class-ICanBoogie.TimeZoneLocation.html
\ No newline at end of file
+[TimeZoneLocation]: http://icanboogie.org/docs/class-ICanBoogie.TimeZoneLocation.html
+
diff --git a/composer.json b/composer.json
index 74a7bf7..670a0d9 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
 		"php": ">=5.3.0"
 	},
 	"require-dev": {
-		"icanboogie/common": "*"
+		"icanboogie/common": "~1.2"
 	},
 	"suggest": {
 		"icanboogie/common": "Allows finer exceptions to be thrown"
@@ -30,4 +30,5 @@
 	"autoload": {
 		"classmap": [ "lib/" ]
 	}
-}
\ No newline at end of file
+}
+
diff --git a/lib/datetime.php b/lib/DateTime.php
old mode 100755
new mode 100644
similarity index 100%
rename from lib/datetime.php
rename to lib/DateTime.php
diff --git a/lib/timezone.php b/lib/TimeZone.php
old mode 100755
new mode 100644
similarity index 100%
rename from lib/timezone.php
rename to lib/TimeZone.php
diff --git a/lib/timezonelocation.php b/lib/TimeZoneLocation.php
old mode 100755
new mode 100644
similarity index 100%
rename from lib/timezonelocation.php
rename to lib/TimeZoneLocation.php