Add some more options for ack
Updated aptitude/config
Merge remote-tracking branch 'upstream/release/0.2.0' into develop