renamed prune to resolveConflict
updated .gitignore
adding travis ci builds
added build status
initial support for configurations
fixes build breakage
Merge branch 'master' of git://github.com/freekh/adept

Conflicts:
	src/main/scala/adept/Adept.scala