diff --git a/.gitignore b/.gitignore
index fd7f94d..1054612 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,23 @@
+# Composer
 composer.lock
 composer.phar
+
+# Twig
 vendor/twig/twig/doc/*
 vendor/twig/twig/ext/*
-vendor/twig/twig/test/*
\ No newline at end of file
+vendor/twig/twig/test/*
+
+# OS Generated
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+*.swp
+
+# User themes
+themes/*
+!themes/index.html
+!themes/default/*
+
+# User config
+config.php.dist
\ No newline at end of file
diff --git a/config.php b/config.php
deleted file mode 100644
index 471d78f..0000000
--- a/config.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php 
-
-/*
-// Override any of the default settings below:
-
-$config['site_title'] = 'Pico';			// Site title
-$config['base_url'] = ''; 				// Override base URL (e.g. http://example.com)
-$config['theme'] = 'default'; 			// Set the theme (defaults to "default")
-$config['date_format'] = 'jS M Y';		// Set the PHP date format
-$config['twig_config'] = array(			// Twig settings
-	'cache' => false,					// To enable Twig caching change this to CACHE_DIR
-	'autoescape' => false,				// Autoescape Twig vars
-	'debug' => false					// Enable Twig debug
-);
-$config['pages_order_by'] = 'alpha';	// Order pages by "alpha" or "date"
-$config['pages_order'] = 'asc';			// Order pages "asc" or "desc"
-$config['excerpt_length'] = 50;			// The pages excerpt length (in words)
-
-// To add a custom config setting:
-
-$config['custom_setting'] = 'Hello'; 	// Can be accessed by {{ config.custom_setting }} in a theme
-
-*/
-
-// End of file
\ No newline at end of file
diff --git a/lib/pico.php b/lib/pico.php
index a88a1f8..cb3c207 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -179,10 +179,8 @@ class Pico {
 	 */
 	private function get_config()
 	{
-		if(!file_exists(ROOT_DIR .'config.php')) return array();
-		
 		global $config;
-		require_once(ROOT_DIR .'config.php');
+		@include_once(ROOT_DIR .'config.php');
 
 		$defaults = array(
 			'site_title' => 'Pico',