add a manifest that can add files, directories and lookup files in them
organize location of specs
raise if borrower can't find a file
spec and implementation for merge files -- only implemented for files that use # as a comment delimiter
rm errant puts
Merge branch 'master' into feature/borrow_merge
use indentation to cleanup merge_spec
cleanup a few specs to use helper methods
failing test for passing merge as true
passing test for move & merge
allow for setting arbitrary comment symbols
add manifest stuff to readme
add merge documentation to readme
add travis file, add rake to test group to make `rake` default run tests
update changelog and version