update install
add cufflinks and build gene models with cufflinks
fix conflicts and merge