--- a/.hgignore	Thu Jul 11 11:03:18 2013 -0400
+++ b/.hgignore	Thu Jul 11 15:21:13 2013 -0400
@@ -22,6 +22,8 @@
 
 CMakeCache.txt
 *.cmake
+Makefile
+install_manifest.txt
 
 latex
 html

--- a/Makefile	Thu Jul 11 11:03:18 2013 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-# Remove some rules from gmake that .SUFFIXES does not remove.
-SUFFIXES =
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /usr/bin/ccmake
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/nicolas/Research/Code/traffic-intelligence
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/nicolas/Research/Code/traffic-intelligence
-
-#=============================================================================
-# Targets provided globally by CMake.
-
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-.PHONY : edit_cache/fast
-
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
-# The main all target
-all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/nicolas/Research/Code/traffic-intelligence/CMakeFiles /home/nicolas/Research/Code/traffic-intelligence/CMakeFiles/progress.marks
-	$(MAKE) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/nicolas/Research/Code/traffic-intelligence/CMakeFiles 0
-.PHONY : all
-
-# The main clean target
-clean:
-	$(MAKE) -f CMakeFiles/Makefile2 clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-.PHONY : depend
-
-#=============================================================================
-# Target rules for targets named bin/feature-based-tracking
-
-# Build rule for target.
-bin/feature-based-tracking: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 bin/feature-based-tracking
-.PHONY : bin/feature-based-tracking
-
-# fast build rule for target.
-bin/feature-based-tracking/fast:
-	$(MAKE) -f CMakeFiles/bin/feature-based-tracking.dir/build.make CMakeFiles/bin/feature-based-tracking.dir/build
-.PHONY : bin/feature-based-tracking/fast
-
-c/feature-based-tracking.o: c/feature-based-tracking.cpp.o
-.PHONY : c/feature-based-tracking.o
-
-# target to build an object file
-c/feature-based-tracking.cpp.o:
-	$(MAKE) -f CMakeFiles/bin/feature-based-tracking.dir/build.make CMakeFiles/bin/feature-based-tracking.dir/c/feature-based-tracking.cpp.o
-.PHONY : c/feature-based-tracking.cpp.o
-
-c/feature-based-tracking.i: c/feature-based-tracking.cpp.i
-.PHONY : c/feature-based-tracking.i
-
-# target to preprocess a source file
-c/feature-based-tracking.cpp.i:
-	$(MAKE) -f CMakeFiles/bin/feature-based-tracking.dir/build.make CMakeFiles/bin/feature-based-tracking.dir/c/feature-based-tracking.cpp.i
-.PHONY : c/feature-based-tracking.cpp.i
-
-c/feature-based-tracking.s: c/feature-based-tracking.cpp.s
-.PHONY : c/feature-based-tracking.s
-
-# target to generate assembly for a file
-c/feature-based-tracking.cpp.s:
-	$(MAKE) -f CMakeFiles/bin/feature-based-tracking.dir/build.make CMakeFiles/bin/feature-based-tracking.dir/c/feature-based-tracking.cpp.s
-.PHONY : c/feature-based-tracking.cpp.s
-
-# Help Target
-help:
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... bin/feature-based-tracking"
-	@echo "... edit_cache"
-	@echo "... rebuild_cache"
-	@echo "... c/feature-based-tracking.o"
-	@echo "... c/feature-based-tracking.i"
-	@echo "... c/feature-based-tracking.s"
-.PHONY : help
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
-