add alias rm -i
update bashrc
add alias and vim auto remove trailing whitespace
update gitignore
update syntax on django
add powerline,ctrlp,nerdtree taglist..
Merge branch 'release/1.0'