Merge branch 'master' into asset-pipeline

.gitignore

@@ -13,4 +13,9 @@ db.newaskbot
 db.oldaskbot
 flushdb.sh
 build
+.coverage
+coverage.xml
+cover/
+log/
+reports/
 \#*\#
\ No newline at end of file

rakefile

@@ -89,13 +89,14 @@ task :package do
         FileUtils.chmod(0755, postinstall.path)
 
         args = ["fakeroot", "fpm", "-s", "dir", "-t", "deb",
+            "--verbose",
             "--after-install=#{postinstall.path}",
             "--prefix=#{INSTALL_DIR_PATH}",
-            "--exclude=build",
+            "--exclude=build/**",
             "--exclude=rakefile",
-            "--exclude=.git",
+            "--exclude=.git/**",
             "--exclude=**/*.pyc",
-            "--exclude=reports",
+            "--exclude=reports/**",
             "-C", "#{REPO_ROOT}",
             "--provides=#{PACKAGE_NAME}",
             "--name=#{NORMALIZED_DEPLOY_NAME}",