refactor initialization code
turn main code into conflicts(list_of_heads) function
search for conflicts script in $PATH
add script to check for conflicts from command line
a couple of files needed to setup package
package setup script
Bash script for fast conflicts reinstall

this is for debug purposes, not to be included in package
Merge branch 'feature/conflicts_package' into develop
.gitignore: add __pycache__ pattern
.gitignore: add distutils temporaries pattern
.gitignore: add project file patterns
.gitignore: add text editor backup file pattern
Merge branch 'feature/gitignore_pydev_distutils' into develop
Switch README from github markdown format
add MANIFEST.in stub needed by distutils
add git-af script stub
add stub for __init__.py
add setup module
Merge branch 'feature/setup_aflow_package' into develop
setup.py: sync long_description with README.txt